diff --git a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java
index 32766beb1..6046bf9e7 100644
--- a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java
+++ b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java
@@ -1181,17 +1181,9 @@ public class BiomeDecoratorBOP extends BiomeDecorator
             this.desertCactusGen.generate(this.currentWorld, this.randomGenerator, var3, var4, var5);
         }
 
-        for (var2 = 0; var2 < this.pondsPerChunk; ++var2)
-        {
-            var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
-            var4 = this.randomGenerator.nextInt(this.randomGenerator.nextInt(120) + 8);
-            var5 = this.chunk_Z + this.randomGenerator.nextInt(16) + 8;
-            (new WorldGenLiquids(Block.waterMoving.blockID)).generate(this.currentWorld, this.randomGenerator, var3, var4, var5);
-        }
-
         if (this.generateLakes)
         {
-            for (var2 = 0; var2 < 50; ++var2)
+            for (var2 = 0; var2 < 50 + pondsPerChunk; ++var2)
             {
                 var3 = this.chunk_X + this.randomGenerator.nextInt(16) + 8;
                 var4 = this.randomGenerator.nextInt(this.randomGenerator.nextInt(120) + 8);
diff --git a/src/minecraft/biomesoplenty/world/WorldChunkManagerPromised.java b/src/minecraft/biomesoplenty/world/WorldChunkManagerPromised.java
index 91cd2685f..6a35ffe8d 100644
--- a/src/minecraft/biomesoplenty/world/WorldChunkManagerPromised.java
+++ b/src/minecraft/biomesoplenty/world/WorldChunkManagerPromised.java
@@ -7,6 +7,7 @@ import java.util.Random;
 
 import biomesoplenty.api.Biomes;
 import biomesoplenty.helpers.BiomeCachePromised;
+import biomesoplenty.world.layer.BiomeLayer;
 
 import net.minecraft.world.ChunkPosition;
 import net.minecraft.world.World;
@@ -23,10 +24,10 @@ import cpw.mods.fml.relauncher.SideOnly;
 public class WorldChunkManagerPromised extends WorldChunkManager
 {
     public static ArrayList<BiomeGenBase> allowedBiomes = new ArrayList<BiomeGenBase>(Arrays.asList(Biomes.promisedLand.get()));
-    private GenLayer genBiomes;
+    private BiomeLayer genBiomes;
 
     /** A GenLayer containing the indices into BiomeGenBase.biomeList[] */
-    private GenLayer biomeIndexLayer;
+    private BiomeLayer biomeIndexLayer;
 
     /** The BiomeCache object for this world. */
     private BiomeCachePromised biomeCache;
@@ -46,8 +47,8 @@ public class WorldChunkManagerPromised extends WorldChunkManager
     public WorldChunkManagerPromised(long par1, WorldType par3WorldType)
     {
         this();
-        GenLayer[] var4 = GenLayer.initializeAllBiomeGenerators(par1, par3WorldType);
-        var4 = getModdedBiomeGenerators(par3WorldType, par1, var4);
+        BiomeLayer[] var4 = BiomeLayer.initializeAllBiomeGenerators(par1, par3WorldType);
+        //var4 = getModdedBiomeGenerators(par3WorldType, par1, var4);
         this.genBiomes = var4[0];
         this.biomeIndexLayer = var4[1];
     }
@@ -275,10 +276,10 @@ public class WorldChunkManagerPromised extends WorldChunkManager
         this.biomeCache.cleanupCache();
     }
 
-    public GenLayer[] getModdedBiomeGenerators(WorldType worldType, long seed, GenLayer[] original)
-    {
-        WorldTypeEvent.InitBiomeGens event = new WorldTypeEvent.InitBiomeGens(worldType, seed, original);
-        MinecraftForge.TERRAIN_GEN_BUS.post(event);
-        return event.newBiomeGens;
-    }
+    //public GenLayer[] getModdedBiomeGenerators(WorldType worldType, long seed, GenLayer[] original)
+    //{
+    //    WorldTypeEvent.InitBiomeGens event = new WorldTypeEvent.InitBiomeGens(worldType, seed, original);
+    //    MinecraftForge.TERRAIN_GEN_BUS.post(event);
+    //    return event.newBiomeGens;
+    //}
 }
diff --git a/src/minecraft/biomesoplenty/world/WorldProviderPromised.java b/src/minecraft/biomesoplenty/world/WorldProviderPromised.java
index a8bd7542c..2f67289f0 100644
--- a/src/minecraft/biomesoplenty/world/WorldProviderPromised.java
+++ b/src/minecraft/biomesoplenty/world/WorldProviderPromised.java
@@ -22,9 +22,9 @@ public class WorldProviderPromised extends WorldProvider
 	{
 		if (Biomes.promisedLand.isPresent())
 		{
-			this.worldChunkMgr = new WorldChunkManagerHell(Biomes.promisedLand.get(), 0.8F, 0.1F);
+			this.worldChunkMgr = new WorldChunkManagerPromised(worldObj);
+			//this.worldChunkMgr = new WorldChunkManagerHell(Biomes.promisedLand.get(), 0.8F, 0.1F);
 		}
-		//this.worldChunkMgr = new WorldChunkManagerPromised(worldObj);
 		this.dimensionId = BOPConfiguration.promisedLandDimID;
 	}
 	
diff --git a/src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java b/src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java
index 3611e7f02..f04495d84 100644
--- a/src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java
+++ b/src/minecraft/biomesoplenty/world/layer/BiomeLayerBiomes.java
@@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase;
 
 public class BiomeLayerBiomes extends BiomeLayer
 {
-	public static ArrayList<BiomeGenBase> Biomes = new ArrayList<BiomeGenBase>();
+	public static ArrayList<BiomeGenBase> AllowedBiomes = new ArrayList<BiomeGenBase>();
 	
     public BiomeLayerBiomes(long par1, BiomeLayer par3GenLayer, WorldType par4WorldType)
     {
@@ -18,7 +18,7 @@ public class BiomeLayerBiomes extends BiomeLayer
 		
 		if (Biomes.promisedLand.isPresent())
 		{
-			Biomes.add(Biomes.promisedLand.get());
+			AllowedBiomes.add(Biomes.promisedLand.get());
 		}
 	} 
 
@@ -33,7 +33,7 @@ public class BiomeLayerBiomes extends BiomeLayer
             {
                 this.initChunkSeed((long)(var8 + par1), (long)(var7 + par2));
                 int var9 = var5[var8 + var7 * par3];
-				var6[var8 + var7 * par3] = Biomes.get(this.nextInt(Biomes.size())).biomeID;
+				var6[var8 + var7 * par3] = AllowedBiomes.get(this.nextInt(AllowedBiomes.size())).biomeID;
             }
         }
         return var6;