diff --git a/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/TileGutter.java b/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/TileGutter.java
index 5176c8d8..d674cc6b 100644
--- a/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/TileGutter.java
+++ b/archaic/src/main/java/resonantinduction/archaic/fluid/gutter/TileGutter.java
@@ -3,11 +3,8 @@ package resonantinduction.archaic.fluid.gutter;
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.RenderBlocks;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
@@ -18,11 +15,11 @@ import net.minecraftforge.client.model.AdvancedModelLoader;
 import net.minecraftforge.client.model.IModelCustom;
 import net.minecraftforge.common.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidContainerRegistry;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTank;
 import net.minecraftforge.fluids.IFluidHandler;
+import net.minecraftforge.fluids.IFluidTank;
 
 import org.lwjgl.opengl.GL11;
 
@@ -205,7 +202,36 @@ public class TileGutter extends TilePressureNode
 
 		if (!world().isRemote)
 		{
-			return FluidUtility.playerActivatedFluidItem(world(), x(), y(), z(), player, side);
+			ArrayList<IFluidTank> tanks = new ArrayList<IFluidTank>();
+
+			synchronized (node.getGrid().getNodes())
+			{
+				for (Object check : node.getGrid().getNodes())
+				{
+					if (check instanceof PressureNode)
+					{
+						tanks.add(((PressureNode) check).parent.getPressureTank());
+					}
+				}
+			}
+			if (FluidUtility.playerActivatedFluidItem(tanks, player, side))
+			{
+				synchronized (node.getGrid().getNodes())
+				{
+					for (Object check : node.getGrid().getNodes())
+					{
+						if (check instanceof PressureNode)
+						{
+							((PressureNode) check).parent.onFluidChanged();
+						}
+					}
+				}
+
+				return true;
+			}
+
+			return false;
+
 		}
 
 		return true;
@@ -241,39 +267,12 @@ public class TileGutter extends TilePressureNode
 	{
 		if (!resource.getFluid().isGaseous())
 		{
-			int totalFill = 0;
-			int trials = 0;
-			FluidStack fillStack = resource.copy();
-
-			// Handle overflow.
-			do
-			{
-				int filled = super.fill(from, fillStack, doFill);
-				totalFill += filled;
-				int remain = fillStack.amount - filled;
-				fillStack.amount -= filled;
-				node.update(1 / 20f);
-				trials++;
-			}
-			while (fillStack.amount > totalFill && trials < 20);
-
-			return totalFill;
+			return super.fill(from, resource, doFill);
 		}
 
 		return 0;
 	}
 
-	@Override
-	public FluidTank getInternalTank()
-	{
-		if (tank == null)
-		{
-			tank = new FluidTank(2 * FluidContainerRegistry.BUCKET_VOLUME);
-		}
-
-		return tank;
-	}
-
 	@Override
 	public boolean canFill(ForgeDirection from, Fluid fluid)
 	{
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
index 38e1cd83..f1792d8b 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/pipe/PartPipe.java
@@ -271,4 +271,9 @@ public class PartPipe extends PartFramedNode<EnumPipeMaterial, PressureNode, IPr
 		node.maxFlowRate = getMaterial().maxFlowRate;
 		node.maxPressure = getMaterial().maxPressure;
 	}
+
+	@Override
+	public void onFluidChanged()
+	{
+	}
 }
\ No newline at end of file
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
index 27f03ad1..ba8a4dbb 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/fluid/transport/TilePump.java
@@ -163,4 +163,10 @@ public class TilePump extends TileMechanical implements IPressureNodeProvider, I
 
 		return super.getNode(nodeType, from);
 	}
+
+	@Override
+	public void onFluidChanged()
+	{
+		
+	}
 }
diff --git a/src/main/java/resonantinduction/core/fluid/TileFluidNode.java b/src/main/java/resonantinduction/core/fluid/TileFluidNode.java
index cdf6c787..9692dde6 100644
--- a/src/main/java/resonantinduction/core/fluid/TileFluidNode.java
+++ b/src/main/java/resonantinduction/core/fluid/TileFluidNode.java
@@ -69,16 +69,16 @@ public abstract class TileFluidNode extends TileBase implements IPacketReceiverW
 			{
 				if (id == PACKET_DESCRIPTION)
 				{
-					this.colorID = data.readInt();
-					this.renderSides = data.readByte();
-					this.tank = new FluidTank(data.readInt());
-					this.getInternalTank().readFromNBT(PacketHandler.readNBTTagCompound(data));
+					colorID = data.readInt();
+					renderSides = data.readByte();
+					tank = new FluidTank(data.readInt());
+					getInternalTank().readFromNBT(PacketHandler.readNBTTagCompound(data));
 					return true;
 				}
 				else if (id == PACKET_RENDER)
 				{
-					this.colorID = data.readInt();
-					this.renderSides = data.readByte();
+					colorID = data.readInt();
+					renderSides = data.readByte();
 					return true;
 				}
 				else if (id == PACKET_TANK)
diff --git a/src/main/java/resonantinduction/core/fluid/TilePressureNode.java b/src/main/java/resonantinduction/core/fluid/TilePressureNode.java
index 474fde63..93addc86 100644
--- a/src/main/java/resonantinduction/core/fluid/TilePressureNode.java
+++ b/src/main/java/resonantinduction/core/fluid/TilePressureNode.java
@@ -23,7 +23,6 @@ public abstract class TilePressureNode extends TileFluidNode implements IPressur
 	public TilePressureNode(Material material)
 	{
 		super(material);
-		getInternalTank().setCapacity(FluidContainerRegistry.BUCKET_VOLUME);
 	}
 
 	@Override
diff --git a/src/main/java/resonantinduction/core/grid/fluid/IPressureNodeProvider.java b/src/main/java/resonantinduction/core/grid/fluid/IPressureNodeProvider.java
index 1121be08..3d870d3d 100644
--- a/src/main/java/resonantinduction/core/grid/fluid/IPressureNodeProvider.java
+++ b/src/main/java/resonantinduction/core/grid/fluid/IPressureNodeProvider.java
@@ -6,5 +6,7 @@ import resonantinduction.core.grid.INodeProvider;
 
 public interface IPressureNodeProvider extends INodeProvider, IFluidHandler
 {
-	FluidTank getPressureTank();
+	public FluidTank getPressureTank();
+
+	public void onFluidChanged();
 }
diff --git a/src/main/java/resonantinduction/core/grid/fluid/PressureNode.java b/src/main/java/resonantinduction/core/grid/fluid/PressureNode.java
index b3fb3258..63085885 100644
--- a/src/main/java/resonantinduction/core/grid/fluid/PressureNode.java
+++ b/src/main/java/resonantinduction/core/grid/fluid/PressureNode.java
@@ -36,8 +36,11 @@ public class PressureNode extends Node<IPressureNodeProvider, TickingGrid, Objec
 	@Override
 	public void update(float deltaTime)
 	{
-		updatePressure();
-		distribute();
+		if (!world().isRemote)
+		{
+			updatePressure();
+			distribute();
+		}
 	}
 
 	protected void updatePressure()