diff --git a/Calclavia-Library b/Calclavia-Library
index 35884df10..2bf099c7d 160000
--- a/Calclavia-Library
+++ b/Calclavia-Library
@@ -1 +1 @@
-Subproject commit 35884df1089997aad2f6880747724645bdd6b649
+Subproject commit 2bf099c7dc833192f9a8c8e8f9d2cce49bf9a03d
diff --git a/src/main/java/resonantinduction/wire/part/PartConductor.java b/src/main/java/resonantinduction/wire/part/PartConductor.java
index 51777735b..786930894 100644
--- a/src/main/java/resonantinduction/wire/part/PartConductor.java
+++ b/src/main/java/resonantinduction/wire/part/PartConductor.java
@@ -30,7 +30,8 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
 	@Override
 	public long onReceiveEnergy(ForgeDirection from, long receive, boolean doReceive)
 	{
-		// new Vector3(tile()).modifyPositionFromSide(from).getTileEntity(world())
+		// new
+		// Vector3(tile()).modifyPositionFromSide(from).getTileEntity(world())
 		return this.getNetwork().produce(this, from.getOpposite(), receive, doReceive);
 	}
 
@@ -70,8 +71,7 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
 	}
 
 	/**
-	 * EXTERNAL USE
-	 * Can this wire be connected by another block?
+	 * EXTERNAL USE Can this wire be connected by another block?
 	 */
 	@Override
 	public boolean canConnect(ForgeDirection direction)
@@ -183,6 +183,6 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
 	public void load(NBTTagCompound nbt)
 	{
 		super.load(nbt);
-		this.getNetwork().setBufferFor(nbt.getLong("savedBuffer"));
+		this.getNetwork().setBufferFor(this, nbt.getLong("savedBuffer"));
 	}
 }
diff --git a/src/main/java/resonantinduction/wire/part/TraitConductor.java b/src/main/java/resonantinduction/wire/part/TraitConductor.java
index fd1b51716..ce1921ac6 100644
--- a/src/main/java/resonantinduction/wire/part/TraitConductor.java
+++ b/src/main/java/resonantinduction/wire/part/TraitConductor.java
@@ -165,17 +165,4 @@ public class TraitConductor extends TileMultipart implements IConductor
 
 		return capacitance;
 	}
-
-	@Override
-	public long getSavedBuffer()
-	{
-		return 0;
-	}
-
-	@Override
-	public void setSaveBuffer(long energy)
-	{
-
-	}
-
 }