diff --git a/src/resonantinduction/BlockAdvancedFurnace.java b/src/resonantinduction/BlockAdvancedFurnace.java
index 4f8762c2..8d1ef4e2 100644
--- a/src/resonantinduction/BlockAdvancedFurnace.java
+++ b/src/resonantinduction/BlockAdvancedFurnace.java
@@ -1,6 +1,9 @@
 package resonantinduction;
 
+import net.minecraft.block.Block;
 import net.minecraft.block.BlockFurnace;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 
@@ -10,9 +13,35 @@ import net.minecraft.world.World;
  */
 public class BlockAdvancedFurnace extends BlockFurnace
 {
-	protected BlockAdvancedFurnace(int par1, boolean par2)
+	protected BlockAdvancedFurnace(int id, boolean isBurning)
 	{
-		super(par1, par2);
+		super(id, isBurning);
+		this.setHardness(3.5F);
+		this.setStepSound(soundStoneFootstep);
+		this.setUnlocalizedName("furnace");
+
+		if (isBurning)
+		{
+			this.setLightValue(0.875F);
+		}
+		else
+		{
+			this.setCreativeTab(CreativeTabs.tabDecorations);
+		}
+	}
+
+	public static BlockAdvancedFurnace createNew(boolean isBurning)
+	{
+		int id = Block.furnaceIdle.blockID;
+
+		if (isBurning)
+		{
+			id = Block.furnaceBurning.blockID;
+		}
+
+		Block.blocksList[id] = null;
+		Item.itemsList[id] = null;
+		return new BlockAdvancedFurnace(id, isBurning);
 	}
 
 	@Override
diff --git a/src/resonantinduction/ResonantInduction.java b/src/resonantinduction/ResonantInduction.java
index 78d95607..2d7e92b8 100644
--- a/src/resonantinduction/ResonantInduction.java
+++ b/src/resonantinduction/ResonantInduction.java
@@ -3,6 +3,7 @@ package resonantinduction;
 import ic2.api.item.Items;
 
 import java.io.File;
+import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.logging.Logger;
@@ -62,6 +63,7 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.ReflectionHelper;
 
 /**
  * @author Calclavia
@@ -120,6 +122,7 @@ public class ResonantInduction
 	public static boolean SOUND_FXS = true;
 	public static boolean LO_FI_INSULATION = false;
 	public static boolean SHINY_SILVER = true;
+	public static boolean REPLACE_FURNACE = true;
 
 	/** Block ID by Jyzarc */
 	private static final int BLOCK_ID_PREFIX = 3200;
@@ -155,7 +158,6 @@ public class ResonantInduction
 	public static Block blockBattery;
 	/** Without Forge Multipart **/
 	private static Block blockWire;
-
 	public static Block blockAdvancedFurnaceIdle, blockAdvancedFurnaceBurning;
 
 	public static final Vector3[] DYE_COLORS = new Vector3[] { new Vector3(), new Vector3(1, 0, 0), new Vector3(0, 0.608, 0.232), new Vector3(0.588, 0.294, 0), new Vector3(0, 0, 1), new Vector3(0.5, 0, 05), new Vector3(0, 1, 1), new Vector3(0.8, 0.8, 0.8), new Vector3(0.3, 0.3, 0.3), new Vector3(1, 0.412, 0.706), new Vector3(0.616, 1, 0), new Vector3(1, 1, 0), new Vector3(0.46f, 0.932, 1), new Vector3(0.5, 0.2, 0.5), new Vector3(0.7, 0.5, 0.1), new Vector3(1, 1, 1) };
@@ -175,6 +177,7 @@ public class ResonantInduction
 		LO_FI_INSULATION = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Use lo-fi insulation texture", LO_FI_INSULATION).getBoolean(LO_FI_INSULATION);
 		SHINY_SILVER = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Shiny silver wires", SHINY_SILVER).getBoolean(SHINY_SILVER);
 		MAX_CONTRACTOR_DISTANCE = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Max EM Contractor Path", MAX_CONTRACTOR_DISTANCE).getInt(MAX_CONTRACTOR_DISTANCE);
+		REPLACE_FURNACE = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Replace vanilla furnace", REPLACE_FURNACE).getBoolean(REPLACE_FURNACE);
 
 		TileEntityEMContractor.ACCELERATION = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Item Acceleration", TileEntityEMContractor.ACCELERATION).getDouble(TileEntityEMContractor.ACCELERATION);
 		TileEntityEMContractor.MAX_REACH = CONFIGURATION.get(Configuration.CATEGORY_GENERAL, "Contractor Max Item Reach", TileEntityEMContractor.MAX_REACH).getInt(TileEntityEMContractor.MAX_REACH);
@@ -191,7 +194,7 @@ public class ResonantInduction
 		{
 			try
 			{
-				itemPartWire = (Item) Class.forName("resonantinduction.wire.multipart.ItemPartWire").getConstructor(Int.class).newInstance(getNextItemID());
+				itemPartWire = (Item) Class.forName("resonantinduction.wire.multipart.ItemPartWire").getConstructor(Integer.TYPE).newInstance(getNextItemID());
 			}
 			catch (Exception e)
 			{
@@ -210,8 +213,14 @@ public class ResonantInduction
 			blockWire = new BlockWire(getNextBlockID());
 		}
 
-		blockAdvancedFurnaceIdle = new BlockAdvancedFurnace(getNextBlockID(), false);
-		blockAdvancedFurnaceBurning = new BlockAdvancedFurnace(getNextBlockID(), true);
+		if (REPLACE_FURNACE)
+		{
+			blockAdvancedFurnaceIdle = BlockAdvancedFurnace.createNew(false);
+			blockAdvancedFurnaceBurning = BlockAdvancedFurnace.createNew(true);
+			GameRegistry.registerBlock(blockAdvancedFurnaceIdle, "ri_" + blockAdvancedFurnaceIdle.getUnlocalizedName());
+			GameRegistry.registerBlock(blockAdvancedFurnaceBurning, "ri_" + blockAdvancedFurnaceBurning.getUnlocalizedName() + "2");
+			GameRegistry.registerTileEntity(TileEntityAdvancedFurnace.class, blockAdvancedFurnaceIdle.getUnlocalizedName());
+		}
 
 		CONFIGURATION.save();
 
diff --git a/src/resonantinduction/TileEntityAdvancedFurnace.java b/src/resonantinduction/TileEntityAdvancedFurnace.java
index a4c87526..d6b9e255 100644
--- a/src/resonantinduction/TileEntityAdvancedFurnace.java
+++ b/src/resonantinduction/TileEntityAdvancedFurnace.java
@@ -14,6 +14,5 @@ public class TileEntityAdvancedFurnace extends TileEntityFurnace
 	public void updateEntity()
 	{
 		super.updateEntity();
-		System.out.println("WOR");
 	}
 }