diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java
index 94c444e3e..e2d8499b8 100644
--- a/src/main/java/mekanism/api/MekanismConfig.java
+++ b/src/main/java/mekanism/api/MekanismConfig.java
@@ -68,6 +68,9 @@ public class MekanismConfig
 		public static double heatPerFuelTick = 4;
 		public static boolean allowTransmitterAlloyUpgrade;
 		public static boolean allowProtection = true;
+		public static boolean accurateHeavyWaterCapture = true;
+		public static int heavyWaterChance = 5;
+
 		public static boolean EnableQuartzCompat;
 		public static boolean EnableDiamondCompat;
 		public static boolean EnablePoorOresCompat;
diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java
index 0728c8b1d..19bf0518b 100755
--- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java
+++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java
@@ -68,14 +68,14 @@ public class GuiElectrolyticSeparator extends GuiMekanism
 				return tileEntity.fluidTank;
 			}
 		}, GuiGauge.Type.STANDARD, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 5, 10));
-
-		guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() {
-			@Override
-			public FluidTank getTank()
-			{
-				return tileEntity.extraTank;
-			}
-		}, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 142, 51));
+		if (tileEntity.hasFilter())
+			guiElements.add(new GuiFluidGauge(new IFluidInfoHandler() {
+				@Override
+				public FluidTank getTank()
+				{
+					return tileEntity.extraTank;
+				}
+			}, GuiGauge.Type.SMALL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 142, 51));
 		guiElements.add(new GuiGasGauge(new IGasInfoHandler() {
 			@Override
 			public GasTank getTank()
@@ -96,7 +96,6 @@ public class GuiElectrolyticSeparator extends GuiMekanism
 		guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 25, 34));
 		guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 58, 51));
 		guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 100, 51));
-		if (tileEntity.hasFilter())
 		guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"), 142, 34).with(SlotOverlay.POWER));
 
 		guiElements.add(new GuiProgress(new IProgressInfoHandler()
diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java
index 393361e06..f6df9aa75 100644
--- a/src/main/java/mekanism/common/CommonProxy.java
+++ b/src/main/java/mekanism/common/CommonProxy.java
@@ -300,7 +300,10 @@ public class CommonProxy implements IGuiProvider
 		general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 4D).getDouble();
 		general.allowTransmitterAlloyUpgrade = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowTransmitterAlloyUpgrade", true).getBoolean();
 		general.allowProtection = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowProtection", true).getBoolean();
-		
+		general.accurateHeavyWaterCapture = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AccurateHeavyWater", false).getBoolean();
+		general.heavyWaterChance = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AccurateHeavyWaterGen", 5).getInt();
+
+
 		general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean();
 		general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean();
 
diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java
index 919a8961c..acc85df0f 100644
--- a/src/main/java/mekanism/common/network/PacketConfigSync.java
+++ b/src/main/java/mekanism/common/network/PacketConfigSync.java
@@ -74,6 +74,8 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
 			dataStream.writeDouble(general.heatPerFuelTick);
 			dataStream.writeBoolean(general.allowTransmitterAlloyUpgrade);
 			dataStream.writeBoolean(general.allowProtection);
+			dataStream.writeBoolean(general.accurateHeavyWaterCapture);
+			dataStream.writeInt(general.heavyWaterChance);
 			dataStream.writeBoolean(general.EnableQuartzCompat);
 			dataStream.writeBoolean(general.EnableDiamondCompat);
 			dataStream.writeBoolean(general.EnablePoorOresCompat);
@@ -268,6 +270,8 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
 			general.heatPerFuelTick = dataStream.readDouble();
 			general.allowTransmitterAlloyUpgrade = dataStream.readBoolean();
 			general.allowProtection = dataStream.readBoolean();
+			general.accurateHeavyWaterCapture = dataStream.readBoolean();
+			general.heavyWaterChance = dataStream.readInt();
 			general.EnableQuartzCompat = dataStream.readBoolean();
 			general.EnableDiamondCompat = dataStream.readBoolean();
 			general.EnablePoorOresCompat = dataStream.readBoolean();
diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java
index 9e69c8cb1..40b4b58df 100644
--- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java
+++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java
@@ -83,8 +83,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
 	{
 		super("ElectricPump", 10000);
 		inventory = new ItemStack[4];
-		
-		upgradeComponent.setSupported(Upgrade.FILTER);
+
+		if (!general.accurateHeavyWaterCapture)
+			upgradeComponent.setSupported(Upgrade.FILTER);
 	}
 
 	@Override
@@ -160,7 +161,9 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
 	
 	public boolean hasFilter()
 	{
-		return upgradeComponent.getInstalledTypes().contains(Upgrade.FILTER);
+		if (!general.accurateHeavyWaterCapture)
+			return upgradeComponent.getInstalledTypes().contains(Upgrade.FILTER);
+		return false;
 	}
 
 	public boolean suck(boolean take)
diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
index ade982d9c..239fdfc4a 100644
--- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
+++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
@@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 
 import mekanism.api.Coord4D;
 import mekanism.api.MekanismConfig;
@@ -63,7 +64,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 	/** The amount of hydrogen this block is storing. */
 	public GasTank rightTank = new GasTank(MAX_GAS);
 
-	public FluidTank extraTank = new FluidTank(24000);
+	public FluidTank extraTank = new FluidTank(12000);
 
 	/** How fast this block can output gas. */
 	public int output = 512;
@@ -95,13 +96,15 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 
     /** This machine's current RedstoneControl type. */
     public RedstoneControl controlType = RedstoneControl.DISABLED;
+	public static final Random rnd = new Random();
+	public static int captureHeavyWaterChance = 5;
 
 	public TileEntityElectrolyticSeparator()
 	{
 		super("ElectrolyticSeparator", MachineType.ELECTROLYTIC_SEPARATOR.baseEnergy);
 		inventory = new ItemStack[5];
-
-		upgradeComponent.setSupported(Upgrade.FILTER);
+		if (MekanismConfig.general.accurateHeavyWaterCapture)
+			upgradeComponent.setSupported(Upgrade.FILTER);
 	}
 
 	@Override
@@ -196,11 +199,9 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 
 				setEnergy(getEnergy() - energyPerTick * operations);
 				clientEnergyUsed = prev - getEnergy();
-
-				if (hasFilter()){
-					extraTank.fill(new FluidStack(FluidRegistry.getFluid("heavywater"), 5), true);
-				if (extraTank.getFluid() != null)
-					System.out.println("Capacity" + extraTank.getFluid().getUnlocalizedName());
+				if (hasFilter() && rnd.nextInt(captureHeavyWaterChance) == 0) {
+						if (fluidTank.getFluid() != null && fluidTank.getFluid().getFluid() == FluidRegistry.WATER)
+							extraTank.fill(new FluidStack(FluidRegistry.getFluid("heavywater"), operations), true);
 				}
 			}
 			else {
@@ -291,7 +292,9 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 	}
 	public boolean hasFilter()
 	{
-		return upgradeComponent.getInstalledTypes().contains(Upgrade.FILTER);
+		if (MekanismConfig.general.accurateHeavyWaterCapture)
+			return upgradeComponent.getInstalledTypes().contains(Upgrade.FILTER);
+		return false;
 	}
 
 	public SeparatorRecipe getRecipe()
@@ -435,6 +438,13 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 			else {
 				rightTank.setGas(null);
 			}
+			if(dataStream.readBoolean())
+			{
+				extraTank.setFluid(new FluidStack(FluidRegistry.getFluid(dataStream.readInt()), dataStream.readInt()));
+			}
+			else {
+				extraTank.setFluid(null);
+			}
 	
 	        controlType = RedstoneControl.values()[dataStream.readInt()];
 			dumpLeft = GasMode.values()[dataStream.readInt()];
@@ -485,6 +495,15 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 		else {
 			data.add(false);
 		}
+		if(extraTank.getFluid() != null)
+		{
+			data.add(true);
+			data.add(extraTank.getFluid().getFluid().getID());
+			data.add(extraTank.getFluidAmount());
+		}
+		else {
+			data.add(false);
+		}
 
         data.add(controlType.ordinal());
 		data.add(dumpLeft.ordinal());
@@ -510,6 +529,10 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 		{
 			fluidTank.readFromNBT(nbtTags.getCompoundTag("fluidTank"));
 		}
+		if(nbtTags.hasKey("extraTank"))
+		{
+			extraTank.readFromNBT(nbtTags.getCompoundTag("extraTank"));
+		}
 
         isActive = nbtTags.getBoolean("isActive");
         controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")];
@@ -530,6 +553,10 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 		{
 			nbtTags.setTag("fluidTank", fluidTank.writeToNBT(new NBTTagCompound()));
 		}
+		if(extraTank.getFluid() != null)
+		{
+			nbtTags.setTag("extraTank", extraTank.writeToNBT(new NBTTagCompound()));
+		}
 
         nbtTags.setBoolean("isActive", isActive);
         nbtTags.setInteger("controlType", controlType.ordinal());
@@ -541,7 +568,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 		nbtTags.setInteger("dumpRight", dumpRight.ordinal());
 	}
 
-	private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getWater", "getWaterNeeded", "getHydrogen", "getHydrogenNeeded", "getOxygen", "getOxygenNeeded"};
+	private static final String[] methods = new String[] {"getEnergy", "getOutput", "getMaxEnergy", "getEnergyNeeded", "getWater", "getWaterNeeded", "getHydrogen", "getHydrogenNeeded", "getOxygen", "getOxygenNeeded", "getHeavyWater", "getHeavyWaterNeeded",};
 
 	@Override
 	public String[] getMethods()
@@ -574,6 +601,10 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 				return new Object[] {rightTank.getStored()};
 			case 9:
 				return new Object[] {rightTank.getNeeded()};
+			case 10:
+				return new Object[] {extraTank.getFluid() != null ? extraTank.getFluid().amount : 0};
+			case 11:
+				return new Object[] {extraTank.getFluid() != null ? (extraTank.getCapacity()- extraTank.getFluid().amount) : 0};
 			default:
 				throw new NoSuchMethodException();
 		}
@@ -602,6 +633,11 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 		{
 			itemStack.stackTagCompound.setTag("rightTank", rightTank.getGas().write(new NBTTagCompound()));
 		}
+		if(extraTank.getFluid() != null)
+		{
+			itemStack.stackTagCompound.setTag("extraTank", extraTank.getFluid().writeToNBT(new NBTTagCompound()));
+		}
+
 	}
 
 	@Override
@@ -610,6 +646,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 		fluidTank.setFluid(FluidStack.loadFluidStackFromNBT(itemStack.stackTagCompound.getCompoundTag("fluidTank")));
 		leftTank.setGas(GasStack.readFromNBT(itemStack.stackTagCompound.getCompoundTag("leftTank")));
 		rightTank.setGas(GasStack.readFromNBT(itemStack.stackTagCompound.getCompoundTag("rightTank")));
+		extraTank.setFluid(FluidStack.loadFluidStackFromNBT(itemStack.stackTagCompound.getCompoundTag("extraTank")));
 	}
 
 	@Override
@@ -627,7 +664,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 	@Override
 	public boolean canDrain(ForgeDirection from, Fluid fluid)
 	{
-		return false;
+		return hasFilter();
 	}
 
 	@Override
@@ -644,6 +681,9 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 	@Override
 	public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain)
 	{
+		if (hasFilter())
+			return extraTank.drain(maxDrain, doDrain);
+
 		return null;
 	}
 
@@ -794,6 +834,6 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 	@Override
 	public Object[] getTanks() 
 	{
-		return new Object[] {fluidTank, leftTank, rightTank};
+		return new Object[] {fluidTank, leftTank, rightTank, extraTank};
 	}
 }