diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenFungiForest.java b/src/minecraft/biomesoplenty/biomes/BiomeGenFungiForest.java
index f5a4a7908..fe32b0e5b 100644
--- a/src/minecraft/biomesoplenty/biomes/BiomeGenFungiForest.java
+++ b/src/minecraft/biomesoplenty/biomes/BiomeGenFungiForest.java
@@ -15,7 +15,7 @@ import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenMoss;
 import biomesoplenty.worldgen.WorldGenPrairie;
 import biomesoplenty.worldgen.WorldGenSwampTall;
-import biomesoplenty.worldgen.WorldGenThickTree;
+import biomesoplenty.worldgen.WorldGenThickTree2;
 import biomesoplenty.worldgen.WorldGenWillow;
 
 public class BiomeGenFungiForest extends BiomeGenBase
@@ -73,7 +73,7 @@ public class BiomeGenFungiForest extends BiomeGenBase
 	 @Override
 	 public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
 	 {
-		 return par1Random.nextInt(2) == 0 ? new WorldGenThickTree(false) : (par1Random.nextInt(5) == 0 ? new WorldGenWillow() : (par1Random.nextInt(3) == 0 ? new WorldGenPrairie(false) : new WorldGenSwampTall()));
+		 return par1Random.nextInt(2) == 0 ? new WorldGenThickTree2(false) : (par1Random.nextInt(5) == 0 ? new WorldGenWillow() : (par1Random.nextInt(3) == 0 ? new WorldGenPrairie(false) : new WorldGenSwampTall()));
 	 }
 
 	 /**
diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java
index 9f36af7e1..8aac0e7e6 100644
--- a/src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java
+++ b/src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java
@@ -43,7 +43,7 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
 	@Override
 	public void registerIcons(IconRegister iconRegister)
 	{
-		textures = new Icon[2][4];
+		textures = new Icon[3][4];
 
 		for (int i = 0; i < 4; ++i)
 		{
diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenThickTree2.java b/src/minecraft/biomesoplenty/worldgen/WorldGenThickTree2.java
new file mode 100644
index 000000000..5e6bbc513
--- /dev/null
+++ b/src/minecraft/biomesoplenty/worldgen/WorldGenThickTree2.java
@@ -0,0 +1,162 @@
+package biomesoplenty.worldgen;
+
+import java.util.Random;
+
+import net.minecraft.block.Block;
+import net.minecraft.world.World;
+import net.minecraft.world.gen.feature.WorldGenerator;
+
+public class WorldGenThickTree2 extends WorldGenerator
+{
+	public WorldGenThickTree2(boolean var1)
+	{
+		super(var1);
+	}
+
+	@Override
+	public boolean generate(World var1, Random var2, int var3, int var4, int var5)
+	{
+		int var6 = var2.nextInt(8) + 16;
+		int var7 = var2.nextInt(8) + 0;
+		int var8 = var6 - var7;
+		int var9 = 2 + var2.nextInt(2);
+		boolean var10 = true;
+
+		if (var4 >= 1 && var4 + var6 + 1 <= 256)
+		{
+			int var11;
+			int var13;
+			int var14;
+			int var15;
+			int var24;
+
+			for (var11 = var4; var11 <= var4 + 1 + var6 && var10; ++var11)
+			{
+				boolean var12 = true;
+
+				if (var11 - var4 < var7)
+				{
+					var24 = 0;
+				}
+				else
+				{
+					var24 = var9;
+				}
+
+				for (var13 = var3 - var24; var13 <= var3 + var24 && var10; ++var13)
+				{
+					for (var14 = var5 - var24; var14 <= var5 + var24 && var10; ++var14)
+					{
+						if (var11 >= 0 && var11 < 256)
+						{
+							var15 = var1.getBlockId(var13, var11, var14);
+
+							if (var15 != 0 && var15 != Block.leaves.blockID)
+							{
+								var10 = false;
+							}
+						}
+						else
+						{
+							var10 = false;
+						}
+					}
+				}
+			}
+
+			if (!var10)
+				return false;
+			else
+			{
+				var11 = var1.getBlockId(var3, var4 - 1, var5);
+				var24 = var1.getBlockId(var3 - 1, var4 - 1, var5);
+				var13 = var1.getBlockId(var3, var4 - 1, var5 - 1);
+				var14 = var1.getBlockId(var3 - 1, var4 - 1, var5 - 1);
+
+				if ((var11 == Block.grass.blockID || var11 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
+				{
+					if ((var24 == Block.grass.blockID || var24 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
+					{
+						if ((var13 == Block.grass.blockID || var24 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
+						{
+							if ((var14 == Block.grass.blockID || var24 == Block.dirt.blockID) && var4 < 256 - var6 - 1)
+							{
+								var1.setBlock(var3, var4 - 1, var5, Block.dirt.blockID);
+								var1.setBlock(var3 - 1, var4 - 1, var5, Block.dirt.blockID);
+								var1.setBlock(var3, var4 - 1, var5 - 1, Block.dirt.blockID);
+								var1.setBlock(var3 - 1, var4 - 1, var5 - 1, Block.dirt.blockID);
+								var15 = var2.nextInt(2);
+								int var16 = 1;
+								boolean var17 = false;
+								int var19;
+								int var18;
+								int var20;
+
+								for (var18 = 0; var18 <= var8; ++var18)
+								{
+									var19 = var4 + var6 - var18;
+
+									for (var20 = var3 - var15; var20 <= var3 + var15; ++var20)
+									{
+										int var21 = var20 - var3;
+
+										for (int var22 = var5 - var15; var22 <= var5 + var15; ++var22)
+										{
+											int var23 = var22 - var5;
+
+											if ((Math.abs(var21) != var15 || Math.abs(var23) != var15 || var15 <= 0) && !Block.opaqueCubeLookup[var1.getBlockId(var20, var19, var22)])
+											{
+												this.setBlockAndMetadata(var1, var20, var19, var22, Block.leaves.blockID, 0);
+												this.setBlockAndMetadata(var1, var20 - 1, var19, var22, Block.leaves.blockID, 0);
+												this.setBlockAndMetadata(var1, var20, var19, var22 - 1, Block.leaves.blockID, 0);
+												this.setBlockAndMetadata(var1, var20 - 1, var19, var22 - 1, Block.leaves.blockID, 0);
+											}
+										}
+									}
+
+									if (var15 >= var16)
+									{
+										var15 = var17 ? 1 : 0;
+										var17 = true;
+										++var16;
+
+										if (var16 > var9)
+										{
+											var16 = var9;
+										}
+									}
+									else
+									{
+										++var15;
+									}
+								}
+
+								var18 = var2.nextInt(3);
+
+								for (var19 = 0; var19 < var6 - var18; ++var19)
+								{
+									var20 = var1.getBlockId(var3, var4 + var19, var5);
+
+									if (var20 == 0 || var20 == Block.leaves.blockID)
+									{
+										this.setBlockAndMetadata(var1, var3, var4 + var19, var5, Block.wood.blockID, 0);
+										this.setBlockAndMetadata(var1, var3 - 1, var4 + var19, var5, Block.wood.blockID, 0);
+										this.setBlockAndMetadata(var1, var3, var4 + var19, var5 - 1, Block.wood.blockID, 0);
+										this.setBlockAndMetadata(var1, var3 - 1, var4 + var19, var5 - 1, Block.wood.blockID, 0);
+									}
+								}
+
+								return true;
+							} else
+								return false;
+						} else
+							return false;
+					} else
+						return false;
+				} else
+					return false;
+			}
+		} else
+			return false;
+	}
+}