diff --git a/src/main/java/com/hbm/inventory/container/ContainerCentrifuge.java b/src/main/java/com/hbm/inventory/container/ContainerCentrifuge.java
index 4fca10fa1..999bce6f6 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerCentrifuge.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerCentrifuge.java
@@ -2,8 +2,11 @@ package com.hbm.inventory.container;
 
 import com.hbm.inventory.SlotCraftingOutput;
 import com.hbm.inventory.SlotUpgrade;
+import com.hbm.items.ModItems;
+import com.hbm.items.machine.ItemMachineUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineCentrifuge;
 
+import api.hbm.energy.IBatteryItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -39,31 +42,43 @@ public class ContainerCentrifuge extends Container {
 	}
 
 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+		ItemStack rStack = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 
-		if(var4 != null && var4.getHasStack()) {
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
-			SlotCraftingOutput.checkAchievements(p_82846_1_, var5);
-
-			if(par2 <= 6) {
-				if(!this.mergeItemStack(var5, 6, this.inventorySlots.size(), true)) {
+		if(slot != null && slot.getHasStack()) {
+			ItemStack stack = slot.getStack();
+			rStack = stack.copy();
+			
+			
+			if(index <= 7) {
+				if(!this.mergeItemStack(stack, 8, this.inventorySlots.size(), true)) {
 					return null;
 				}
-			} else if(!this.mergeItemStack(var5, 0, 2, false)) {
-				return null;
+				
+				slot.onSlotChange(stack, rStack);
+			} else {
+				
+				if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(stack, 1, 2, false))
+						return null;
+					
+				} else if(rStack.getItem() instanceof ItemMachineUpgrade) {
+					if(!this.mergeItemStack(stack, 6, 8, false))
+						return null;
+					
+				} else if(!this.mergeItemStack(stack, 0, 1, false))
+					return null;
 			}
 
-			if(var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
+			if(stack.stackSize == 0) {
+				slot.putStack((ItemStack) null);
 			} else {
-				var4.onSlotChanged();
+				slot.onSlotChanged();
 			}
 		}
 
-		return var3;
+		return rStack;
 	}
 
 	@Override
diff --git a/src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java b/src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java
index 0a6747b9b..55f73ebd7 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerCrystallizer.java
@@ -2,7 +2,9 @@ package com.hbm.inventory.container;
 
 import com.hbm.inventory.SlotCraftingOutput;
 import com.hbm.inventory.SlotUpgrade;
+import com.hbm.items.ModItems;
 import com.hbm.items.machine.IItemFluidIdentifier;
+import com.hbm.items.machine.ItemMachineUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineCrystallizer;
 
 import api.hbm.energy.IBatteryItem;
@@ -46,44 +48,46 @@ public class ContainerCrystallizer extends Container {
 	}
 
 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+		ItemStack rStack = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 
-		if(var4 != null && var4.getHasStack()) {
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
-			SlotCraftingOutput.checkAchievements(p_82846_1_, var5);
+		if(slot != null && slot.getHasStack()) {
+			ItemStack stack = slot.getStack();
+			rStack = stack.copy();
+			SlotCraftingOutput.checkAchievements(player, stack);
 
-			if(par2 <= diFurnace.getSizeInventory() - 1) {
-				if(!this.mergeItemStack(var5, diFurnace.getSizeInventory(), this.inventorySlots.size(), true)) {
+			if(index <= 7) {
+				if(!this.mergeItemStack(stack, 8, this.inventorySlots.size(), true)) {
 					return null;
 				}
 			} else {
 				
-				if(var3.getItem() instanceof IBatteryItem) {
-					if(!this.mergeItemStack(var5, 1, 2, false)) {
+				if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(stack, 1, 2, false))
 						return null;
-					}
-				} else if(var3.getItem() instanceof IItemFluidIdentifier) {
-					if(!this.mergeItemStack(var5, 7, 8, false)) {
+					
+				} else if(rStack.getItem() instanceof IItemFluidIdentifier) {
+					if(!this.mergeItemStack(stack, 7, 8, false))
 						return null;
-					}
-				} else {
-					if(!this.mergeItemStack(var5, 0, 1, false)) {
+					
+				} else if(rStack.getItem() instanceof ItemMachineUpgrade) {
+					if(!this.mergeItemStack(stack, 5, 7, false))
+						return null;
+					
+				} else
+					if(!this.mergeItemStack(stack, 0, 1, false))
 						return null;
-					}
-				}
 			}
 
-			if(var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
+			if(stack.stackSize == 0) {
+				slot.putStack((ItemStack) null);
 			} else {
-				var4.onSlotChanged();
+				slot.onSlotChanged();
 			}
 		}
 
-		return var3;
+		return rStack;
 	}
 
 	@Override
diff --git a/src/main/java/com/hbm/inventory/container/ContainerElectricFurnace.java b/src/main/java/com/hbm/inventory/container/ContainerElectricFurnace.java
index 14e375c65..19ee67510 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerElectricFurnace.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerElectricFurnace.java
@@ -2,8 +2,11 @@ package com.hbm.inventory.container;
 
 import com.hbm.inventory.SlotSmelting;
 import com.hbm.inventory.SlotUpgrade;
+import com.hbm.items.ModItems;
+import com.hbm.items.machine.ItemMachineUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineElectricFurnace;
 
+import api.hbm.energy.IBatteryItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -42,33 +45,42 @@ public class ContainerElectricFurnace extends Container {
 	}
 
 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+		ItemStack rStack = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 
-		if(var4 != null && var4.getHasStack()) {
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
+		if(slot != null && slot.getHasStack()) {
+			ItemStack stack = slot.getStack();
+			rStack = stack.copy();
 
-			if(par2 <= 2) {
-				if(!this.mergeItemStack(var5, 3, this.inventorySlots.size(), true)) {
+			if(index <= 3) {
+				if(!this.mergeItemStack(stack, 4, this.inventorySlots.size(), true)) {
 					return null;
 				}
 
-				var4.onSlotChange(var5, var3);
-			} else if(!this.mergeItemStack(var5, 1, 2, false)) {
-				if(!this.mergeItemStack(var5, 0, 1, false))
+				slot.onSlotChange(stack, rStack);
+			} else {
+				
+				if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(stack, 0, 1, false))
+						return null;
+					
+				} else if(rStack.getItem() instanceof ItemMachineUpgrade) {
+					if(!this.mergeItemStack(stack, 3, 4, false))
+						return null;
+					
+				} else if(!this.mergeItemStack(stack, 1, 2, false))
 					return null;
 			}
 
-			if(var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
+			if(stack.stackSize == 0) {
+				slot.putStack((ItemStack) null);
 			} else {
-				var4.onSlotChanged();
+				slot.onSlotChanged();
 			}
 		}
 
-		return var3;
+		return rStack;
 	}
 
 	@Override
diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineArcFurnace.java b/src/main/java/com/hbm/inventory/container/ContainerMachineArcFurnace.java
index 746bef698..15fbae2e9 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerMachineArcFurnace.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerMachineArcFurnace.java
@@ -1,7 +1,11 @@
 package com.hbm.inventory.container;
 
 import com.hbm.inventory.SlotSmelting;
+import com.hbm.items.ModItems;
+import com.hbm.items.machine.ItemMachineUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineArcFurnace;
+
+import api.hbm.energy.IBatteryItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -41,34 +45,43 @@ public class ContainerMachineArcFurnace extends Container {
 	}
 
 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2) {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(par2);
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
+		ItemStack rStack = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 
-		if(var4 != null && var4.getHasStack()) {
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
+		if(slot != null && slot.getHasStack()) {
+			ItemStack stack = slot.getStack();
+			rStack = stack.copy();
 
-			if(par2 <= 5) {
-				if(!this.mergeItemStack(var5, 6, this.inventorySlots.size(), true)) {
+			if(index <= 5) {
+				if(!this.mergeItemStack(stack, 6, this.inventorySlots.size(), true)) {
 					return null;
 				}
 				
-				var4.onSlotChange(var5, var3);
+				slot.onSlotChange(stack, rStack);
 				
-			} else if(!this.mergeItemStack(var5, 0, 1, false)) {
-				if(!this.mergeItemStack(var5, 2, 6, false))
+			} else {
+				
+				if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(stack, 5, 6, false))
+						return null;
+					
+				} else if(rStack.getItem() == ModItems.arc_electrode_desh || rStack.getItem() == ModItems.arc_electrode) {
+					if(!this.mergeItemStack(stack, 2, 5, false))
+						return null;
+					
+				} else if(!this.mergeItemStack(stack, 0, 1, false))
 					return null;
 			}
 
-			if(var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
+			if(stack.stackSize == 0) {
+				slot.putStack((ItemStack) null);
 			} else {
-				var4.onSlotChanged();
+				slot.onSlotChanged();
 			}
 		}
 
-		return var3;
+		return rStack;
 	}
 
 	@Override
diff --git a/src/main/java/com/hbm/inventory/container/ContainerMachineArcWelder.java b/src/main/java/com/hbm/inventory/container/ContainerMachineArcWelder.java
index 9c5d516b8..701d718bf 100644
--- a/src/main/java/com/hbm/inventory/container/ContainerMachineArcWelder.java
+++ b/src/main/java/com/hbm/inventory/container/ContainerMachineArcWelder.java
@@ -3,6 +3,7 @@ package com.hbm.inventory.container;
 import com.hbm.inventory.SlotCraftingOutput;
 import com.hbm.inventory.SlotUpgrade;
 import com.hbm.items.ModItems;
+import com.hbm.items.machine.IItemFluidIdentifier;
 import com.hbm.items.machine.ItemMachineUpgrade;
 import com.hbm.tileentity.machine.TileEntityMachineArcWelder;
 
@@ -52,35 +53,37 @@ public class ContainerMachineArcWelder extends Container {
 
 	@Override
 	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
-		ItemStack var3 = null;
-		Slot var4 = (Slot) this.inventorySlots.get(index);
+		ItemStack rStack = null;
+		Slot slot = (Slot) this.inventorySlots.get(index);
 
-		if(var4 != null && var4.getHasStack()) {
-			ItemStack var5 = var4.getStack();
-			var3 = var5.copy();
+		if(slot != null && slot.getHasStack()) {
+			ItemStack stack = slot.getStack();
+			rStack = stack.copy();
 
-			if(index <= 3) {
-				if(!this.mergeItemStack(var5, 4, this.inventorySlots.size(), true)) {
+			if(index <= 7) {
+				if(!this.mergeItemStack(stack, 8, this.inventorySlots.size(), true)) {
 					return null;
 				}
 			} else {
 				
-				if(var3.getItem() instanceof IBatteryItem || var3.getItem() == ModItems.battery_creative) {
-					if(!this.mergeItemStack(var5, 4, 5, false)) return null;
-				} else if(var3.getItem() instanceof ItemMachineUpgrade ) {
-					if(!this.mergeItemStack(var5, 6, 8, false)) return null;
+				if(rStack.getItem() instanceof IBatteryItem || rStack.getItem() == ModItems.battery_creative) {
+					if(!this.mergeItemStack(stack, 4, 5, false)) return null;
+				} else if(rStack.getItem() instanceof IItemFluidIdentifier) {
+					if(!this.mergeItemStack(stack, 5, 6, false)) return null;
+				} else if(rStack.getItem() instanceof ItemMachineUpgrade ) {
+					if(!this.mergeItemStack(stack, 6, 8, false)) return null;
 				} else {
-					if(!this.mergeItemStack(var5, 0, 3, false)) return null;
+					if(!this.mergeItemStack(stack, 0, 3, false)) return null;
 				}
 			}
 
-			if(var5.stackSize == 0) {
-				var4.putStack((ItemStack) null);
+			if(stack.stackSize == 0) {
+				slot.putStack((ItemStack) null);
 			} else {
-				var4.onSlotChanged();
+				slot.onSlotChanged();
 			}
 		}
 
-		return var3;
+		return rStack;
 	}
 }