diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java
index 9e7d70d4..065a15b1 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/YOTTAHatch.java
@@ -5,10 +5,10 @@
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
 import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
@@ -53,12 +53,14 @@ public class YOTTAHatch extends GT_MetaTileEntity_Hatch implements IGridProxyabl
     private AENetworkProxy gridProxy = null;
     private int priority;
     private byte tickRate = 20;
-    private String lastFluid = "";
+    private FluidStack lastFluid = null;
     private BigInteger lastAmt = BigInteger.ZERO;
     private AccessRestriction readMode = AccessRestriction.READ_WRITE;
     private final AccessRestriction[] AEModes = new AccessRestriction[] { AccessRestriction.NO_ACCESS,
             AccessRestriction.READ, AccessRestriction.WRITE, AccessRestriction.READ_WRITE };
 
+    private static final BigInteger MAX_LONG_BIGINT = BigInteger.valueOf(Long.MAX_VALUE);
+
     public YOTTAHatch(int aID, String aName, String aNameRegional, int aTier) {
         super(
                 aID,
@@ -104,7 +106,8 @@ public boolean isAccessAllowed(EntityPlayer aPlayer) {
     }
 
     @Override
-    public final void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+    public final void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ,
+            ItemStack toolStack) {
         if (aPlayer.isSneaking()) this.priority -= 10;
         else this.priority += 10;
         GT_Utility.sendChatToPlayer(
@@ -114,7 +117,7 @@ public final void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPla
 
     @Override
     public boolean onSolderingToolRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
-            float aX, float aY, float aZ) {
+            float aX, float aY, float aZ, ItemStack toolStack) {
         this.readMode = AEModes[(readMode.ordinal() + 1) % 4];
         GT_Utility.sendChatToPlayer(
                 aPlayer,
@@ -156,14 +159,12 @@ public DimensionalCoord getLocation() {
     public IItemList<IAEFluidStack> getAvailableItems(IItemList<IAEFluidStack> out) {
         if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive())
             return out;
-        if (host.mFluidName == null || host.mFluidName.equals("")
-                || host.mStorageCurrent.compareTo(BigInteger.ZERO) <= 0)
-            return out;
+        if (host.mFluid == null || host.mStorageCurrent.signum() <= 0) return out;
         long ready;
-        if (host.mStorageCurrent.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0) {
+        if (host.mStorageCurrent.compareTo(MAX_LONG_BIGINT) >= 0) {
             ready = Long.MAX_VALUE;
         } else ready = host.mStorageCurrent.longValue();
-        out.add(StackUtils.createAEFluidStack(FluidRegistry.getFluid(host.mFluidName), ready));
+        out.add(StackUtils.createAEFluidStack(host.mFluid.getFluid(), ready));
         return out;
     }
 
@@ -228,7 +229,7 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
     @Override
     public int getCapacity() {
         if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) return 0;
-        if (host.mStorage.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) >= 0) {
+        if (host.mStorage.compareTo(YottaFluidTank.MAX_INT_BIGINT) >= 0) {
             return Integer.MAX_VALUE;
         } else return host.mStorage.intValue();
     }
@@ -236,40 +237,51 @@ public int getCapacity() {
     @Override
     public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
         if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) return 0;
-        if (host.mLockedFluidName != null && !host.mLockedFluidName.equals("")
-                && !host.mLockedFluidName.equals(resource.getFluid().getName()))
-            return 0;
-        if (host.mFluidName == null || host.mFluidName.equals("")
-                || host.mFluidName.equals(resource.getFluid().getName())) {
-            host.mFluidName = resource.getFluid().getName();
-            if (host.mStorage.subtract(host.mStorageCurrent).compareTo(BigInteger.valueOf(resource.amount)) >= 0) {
-                if (doFill) host.addFluid(resource.amount);
+        if (host.mLockedFluid != null && !host.mLockedFluid.isFluidEqual(resource)) return 0;
+        if (host.mFluid == null || host.mFluid.isFluidEqual(resource)) {
+            if (host.mFluid == null) {
+                host.mFluid = resource.copy();
+                host.mFluid.amount = 1;
+            }
+
+            if (host.addFluid(resource.amount, doFill)) {
                 return resource.amount;
             } else {
-                int added = host.mStorage.subtract(host.mStorageCurrent).intValue();
-                if (doFill) host.addFluid(added);
-                return host.getIsVoidExcessEnabled() ? resource.amount : added;
+                final int returned;
+                if (host.getIsVoidExcessEnabled()) {
+                    returned = resource.amount;
+                } else {
+                    final BigInteger delta = host.mStorage.subtract(host.mStorageCurrent);
+                    returned = delta.intValueExact();
+                }
+                host.mStorageCurrent = host.mStorage;
+                return returned;
             }
         }
         return 0;
     }
 
-    public long fill(ForgeDirection from, IAEFluidStack resource, boolean doFill) {
+    public long fill(@SuppressWarnings("unused") ForgeDirection from, IAEFluidStack resource, boolean doFill) {
         if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive()) return 0;
-        if (host.mLockedFluidName != null && !host.mLockedFluidName.equals("")
-                && !host.mLockedFluidName.equals(resource.getFluid().getName()))
-            return 0;
-        if (host.mFluidName == null || host.mFluidName.equals("")
-                || host.mFluidName.equals(resource.getFluid().getName())) {
-            host.mFluidName = resource.getFluid().getName();
-            if (host.mStorage.subtract(host.mStorageCurrent).compareTo(BigInteger.valueOf(resource.getStackSize()))
-                    >= 0) {
-                if (doFill) host.addFluid(resource.getStackSize());
+        if (host.mLockedFluid != null && host.mLockedFluid.getFluid() != resource.getFluid()) return 0;
+        if (host.mFluid == null || host.mFluid.getFluid() == resource.getFluid()) {
+            if (host.mFluid == null) {
+                host.mFluid = resource.getFluidStack(); // makes a copy internally
+                host.mFluid.amount = 1;
+            }
+
+            if (host.addFluid(resource.getStackSize(), doFill)) {
                 return resource.getStackSize();
             } else {
-                long added = host.mStorage.subtract(host.mStorageCurrent).longValue();
-                if (doFill) host.addFluid(added);
-                return host.getIsVoidExcessEnabled() ? resource.getStackSize() : added;
+                final long returned;
+                if (host.getIsVoidExcessEnabled()) {
+                    returned = resource.getStackSize();
+                } else {
+                    final BigInteger delta = host.mStorage.subtract(host.mStorageCurrent);
+                    returned = delta.longValueExact();
+                }
+                host.mStorageCurrent = host.mStorage;
+                return returned;
             }
         }
         return 0;
@@ -279,11 +291,9 @@ public long fill(ForgeDirection from, IAEFluidStack resource, boolean doFill) {
     public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) {
         if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive())
             return null;
-        if (host.mFluidName == null || host.mFluidName.equals("")
-                || !host.mFluidName.equals(resource.getFluid().getName()))
-            return null;
+        if (host.mFluid == null || host.mFluid.getFluid() != resource.getFluid()) return null;
         int ready;
-        if (host.mStorageCurrent.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) > 0) {
+        if (host.mStorageCurrent.compareTo(YottaFluidTank.MAX_INT_BIGINT) >= 0) {
             ready = Integer.MAX_VALUE;
         } else ready = host.mStorageCurrent.intValue();
         ready = Math.min(ready, resource.amount);
@@ -293,14 +303,13 @@ public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrai
         return new FluidStack(resource.getFluid(), ready);
     }
 
-    public IAEFluidStack drain(ForgeDirection from, IAEFluidStack resource, boolean doDrain) {
+    public IAEFluidStack drain(@SuppressWarnings("unused") ForgeDirection from, IAEFluidStack resource,
+            boolean doDrain) {
         if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive())
             return null;
-        if (host.mFluidName == null || host.mFluidName.equals("")
-                || !host.mFluidName.equals(resource.getFluid().getName()))
-            return null;
+        if (host.mFluid == null || host.mFluid.getFluid() != resource.getFluid()) return null;
         long ready;
-        if (host.mStorageCurrent.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0) {
+        if (host.mStorageCurrent.compareTo(MAX_LONG_BIGINT) > 0) {
             ready = Long.MAX_VALUE;
         } else ready = host.mStorageCurrent.longValue();
         ready = Math.min(ready, resource.getStackSize());
@@ -316,26 +325,20 @@ public IAEFluidStack drain(ForgeDirection from, IAEFluidStack resource, boolean
     public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
         if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive())
             return null;
-        if (host.mFluidName == null || host.mFluidName.equals("")) return null;
-        return this.drain(from, FluidRegistry.getFluidStack(host.mFluidName, maxDrain), doDrain);
+        if (host.mFluid == null) return null;
+        final FluidStack drainStack = host.mFluid.copy();
+        drainStack.amount = maxDrain;
+        return this.drain(from, drainStack, doDrain);
     }
 
+    private static final FluidTankInfo[] EMPTY_TANK_INFO = new FluidTankInfo[] { new FluidTankInfo(null, 0) };
+
     @Override
     public FluidTankInfo[] getTankInfo(ForgeDirection from) {
-        FluidTankInfo[] tankInfo = new FluidTankInfo[1];
-        tankInfo[0] = new FluidTankInfo(null, 0);
         if (host == null || host.getBaseMetaTileEntity() == null || !host.getBaseMetaTileEntity().isActive())
-            return tankInfo;
-        FluidStack fluid = null;
-        if (host.mFluidName != null && !host.mFluidName.equals("")) {
-            int camt;
-            if (host.mStorageCurrent.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) > 0) camt = Integer.MAX_VALUE;
-            else camt = host.mStorageCurrent.intValue();
-            fluid = FluidRegistry.getFluidStack(host.mFluidName, camt);
-        }
+            return EMPTY_TANK_INFO;
 
-        tankInfo[0] = new FluidTankInfo(fluid, getCapacity());
-        return tankInfo;
+        return host.getTankInfo(from);
     }
 
     @Override
@@ -386,6 +389,7 @@ public boolean canAccept(IAEFluidStack input) {
     }
 
     @Override
+    @SuppressWarnings("rawtypes")
     public List<IMEInventoryHandler> getCellArray(StorageChannel channel) {
         List<IMEInventoryHandler> list = new ArrayList<>();
         if (channel == StorageChannel.FLUIDS) {
@@ -419,13 +423,13 @@ public void saveChanges(IMEInventory cellInventory) {
 
     private boolean isChanged() {
         if (this.host == null) return false;
-        return !this.lastAmt.equals(this.host.mStorageCurrent) || !this.lastFluid.equals(this.host.mFluidName);
+        return !this.lastAmt.equals(this.host.mStorageCurrent) || this.lastFluid != this.host.mFluid;
     }
 
     private void update() {
         if (this.host == null) return;
         this.lastAmt = this.host.mStorageCurrent;
-        this.lastFluid = this.host.mFluidName;
+        this.lastFluid = this.host.mFluid;
     }
 
     private void faster() {
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java
index c3fde411..ca5d44fd 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java
@@ -81,8 +81,16 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM
     public BigInteger mStorage = BigInteger.ZERO;
     /** Amount of fluid millibuckets currently in the tank */
     public BigInteger mStorageCurrent = BigInteger.ZERO;
-    public String mFluidName = "";
-    public String mLockedFluidName = "";
+    /**
+     * Fluid type currently stored in the tank, can be null. Stack size is always 1, real amount is stored in
+     * mStorageCurrent.
+     */
+    public FluidStack mFluid = null;
+    /**
+     * Fluid type currently the tank is currently locked to, can be null. Stack size is always 1, real amount is stored
+     * in mStorageCurrent.
+     */
+    public FluidStack mLockedFluid = null;
     protected boolean isFluidLocked = false;
     protected int glassMeta;
     protected int maxCell;
@@ -92,7 +100,7 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM
     protected final NumberFormatMUI numberFormat = new NumberFormatMUI();
     private int workTickCounter = 0;
 
-    private static final BigInteger MAX_INT_BIGINT = BigInteger.valueOf(Integer.MAX_VALUE);
+    public static final BigInteger MAX_INT_BIGINT = BigInteger.valueOf(Integer.MAX_VALUE);
 
     protected boolean voidExcessEnabled = false;
 
@@ -121,28 +129,26 @@ public String getStored() {
     }
 
     public String getFluidName() {
-        if (StringUtils.isEmpty(mFluidName) || !FluidRegistry.isFluidRegistered(mFluidName))
-            return StatCollector.translateToLocal("scanner.info.YOTTank.empty");
-        return FluidRegistry.getFluidStack(mFluidName, 1).getLocalizedName();
+        if (mFluid == null) return StatCollector.translateToLocal("scanner.info.YOTTank.empty");
+        return mFluid.getLocalizedName();
     }
 
     public String getLockedFluidName() {
         if (!isFluidLocked) return StatCollector.translateToLocal("scanner.info.YOTTank.none");
-        if (StringUtils.isEmpty(mLockedFluidName) || !FluidRegistry.isFluidRegistered(mLockedFluidName))
-            return StatCollector.translateToLocal("scanner.info.YOTTank.next");
-        return FluidRegistry.getFluidStack(mLockedFluidName, 1).getLocalizedName();
+        if (mLockedFluid == null) return StatCollector.translateToLocal("scanner.info.YOTTank.next");
+        return mLockedFluid.getLocalizedName();
     }
 
     @Override
     public void loadNBTData(NBTTagCompound aNBT) {
         String tAmount = aNBT.getString("mStorage");
         String tAmountCurrent = aNBT.getString("mStorageCurrent");
-        if (tAmount == null || tAmount.equals("")) tAmount = "0";
-        if (tAmountCurrent == null || tAmountCurrent.equals("")) tAmountCurrent = "0";
+        if (StringUtils.isEmpty(tAmount)) tAmount = "0";
+        if (StringUtils.isEmpty(tAmountCurrent)) tAmountCurrent = "0";
         mStorage = new BigInteger(tAmount, 10);
         mStorageCurrent = new BigInteger(tAmountCurrent, 10);
-        mFluidName = aNBT.getString("mFluidName");
-        mLockedFluidName = aNBT.getString("mLockedFluidName");
+        mFluid = FluidRegistry.getFluidStack(aNBT.getString("mFluidName"), 1);
+        mLockedFluid = FluidRegistry.getFluidStack(aNBT.getString("mLockedFluidName"), 1);
         voidExcessEnabled = aNBT.getBoolean("voidExcessEnabled");
         isFluidLocked = aNBT.getBoolean("isFluidLocked");
         super.loadNBTData(aNBT);
@@ -152,8 +158,8 @@ public void loadNBTData(NBTTagCompound aNBT) {
     public void saveNBTData(NBTTagCompound aNBT) {
         aNBT.setString("mStorage", mStorage.toString(10));
         aNBT.setString("mStorageCurrent", mStorageCurrent.toString(10));
-        aNBT.setString("mFluidName", mFluidName);
-        aNBT.setString("mLockedFluidName", mLockedFluidName);
+        aNBT.setString("mFluidName", mFluid == null ? "" : mFluid.getFluid().getName());
+        aNBT.setString("mLockedFluidName", mLockedFluid == null ? "" : mLockedFluid.getFluid().getName());
         aNBT.setBoolean("voidExcessEnabled", voidExcessEnabled);
         aNBT.setBoolean("isFluidLocked", isFluidLocked);
         super.saveNBTData(aNBT);
@@ -191,15 +197,18 @@ public boolean reduceFluid(long amount) {
      * it.
      *
      * @param amount The millibucket amount of the fluid to insert
+     * @param doFill Whether to actually fill, or just simulate a fill
      * @return True if successfully added the given amount of fluid to the tank, false if failed.
      */
-    public boolean addFluid(long amount) {
+    public boolean addFluid(long amount, boolean doFill) {
         final BigInteger bigAmount = BigInteger.valueOf(amount);
         final BigInteger newTotal = mStorageCurrent.add(bigAmount);
         if (newTotal.compareTo(mStorage) > 0) {
             return false;
         } else {
-            mStorageCurrent = newTotal;
+            if (doFill) {
+                mStorageCurrent = newTotal;
+            }
             return true;
         }
     }
@@ -209,8 +218,23 @@ public boolean addFluid(long amount) {
 
     @Override
     public FluidTankInfo[] getTankInfo(ForgeDirection aSide) {
-        int fluidSize = mStorageCurrent.compareTo(MAX_INT_BIGINT) > 0 ? Integer.MAX_VALUE : mStorageCurrent.intValue();
-        tankInfoCache[0] = new FluidTankInfo(FluidRegistry.getFluidStack(mFluidName, fluidSize), fluidSize);
+        int fluidSize = mStorageCurrent.compareTo(MAX_INT_BIGINT) >= 0 ? Integer.MAX_VALUE : mStorageCurrent.intValue();
+        int tankCapacity = mStorage.compareTo(MAX_INT_BIGINT) >= 0 ? Integer.MAX_VALUE : mStorage.intValue();
+        final boolean cacheNeedsRecreation;
+        if (tankInfoCache[0] == null || tankInfoCache[0].capacity != tankCapacity) {
+            cacheNeedsRecreation = true;
+        } else if (tankInfoCache[0].fluid == null) {
+            cacheNeedsRecreation = (mFluid != null);
+        } else {
+            cacheNeedsRecreation = !tankInfoCache[0].fluid.isFluidEqual(mFluid);
+        }
+        if (cacheNeedsRecreation) {
+            final FluidStack storedFluid = mFluid.copy();
+            storedFluid.amount = fluidSize;
+            tankInfoCache[0] = new FluidTankInfo(storedFluid, tankCapacity);
+        } else if (mFluid != null) {
+            tankInfoCache[0].fluid.amount = fluidSize;
+        }
         return tankInfoCache;
     }
 
@@ -235,9 +259,8 @@ public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStac
         // maxCell+1 = Tier of highest Cell. glassMeta is the glass voltage tier
         if (maxCell + 3 <= glassMeta) {
             if (mStorage.compareTo(mStorageCurrent) < 0) mStorageCurrent = mStorage;
-            if (FluidRegistry.getFluidStack(mFluidName, 1) == null) {
+            if (mFluid == null) {
                 mStorageCurrent = BigInteger.ZERO;
-                mFluidName = "";
             }
             mWrench = true;
             mScrewdriver = true;
@@ -413,18 +436,19 @@ public boolean onRunningTick(ItemStack aStack) {
             for (FluidStack tFluid : tStore) {
                 if (tFluid == null) continue;
                 if (isFluidLocked) {
-                    if (StringUtils.isNotEmpty(mLockedFluidName)) {
-                        if (!tFluid.getFluid().getName().equals(mLockedFluidName)) continue;
+                    if (mLockedFluid != null) {
+                        if (!tFluid.isFluidEqual(mLockedFluid)) continue;;
                     } else {
-                        mLockedFluidName = tFluid.getFluid().getName();
+                        mLockedFluid = tFluid.copy();
+                        mLockedFluid.amount = 1;
                     }
                 }
-                if (StringUtils.isEmpty(mFluidName) || tFluid.getFluid().getName().equals(mFluidName)) {
-                    if (StringUtils.isEmpty(mFluidName)) {
-                        mFluidName = tFluid.getFluid().getName();
+                if (mFluid == null || tFluid.isFluidEqual(mFluid)) {
+                    if (mFluid == null) {
+                        mFluid = tFluid.copy();
+                        mFluid.amount = 1;
                     }
-                    if (addFluid(tFluid.amount)) {
-                        mStorageCurrent = mStorageCurrent.add(new BigInteger(tFluid.amount + ""));
+                    if (addFluid(tFluid.amount, true)) {
                         tFluid.amount = 0;
                     } else {
                         if (voidExcessEnabled) {
@@ -439,21 +463,20 @@ public boolean onRunningTick(ItemStack aStack) {
             }
 
             if (mStorageCurrent.compareTo(BigInteger.ZERO) <= 0) {
-                mFluidName = "";
+                mFluid = null;
             }
 
-            if (StringUtils.isNotEmpty(mFluidName)) {
+            if (mFluid != null) {
                 // Try to drain 1% of the tank per tick, so 20% per second aka 1/5
                 int outputAmount = mStorageCurrent.divide(FIVE).min(MAX_INT_BIGINT).max(BigInteger.ONE).intValueExact();
                 final int originalOutputAmount = outputAmount;
 
-                final FluidStack fluidToOutput = FluidRegistry.getFluidStack(mFluidName, outputAmount);
                 for (final GT_MetaTileEntity_Hatch outputHatch : mOutputHatches) {
                     final FluidStack fluidInHatch = outputHatch.mFluid;
 
                     final int remainingHatchSpace;
                     if (fluidInHatch != null) {
-                        if (fluidInHatch.isFluidEqual(fluidToOutput)) {
+                        if (fluidInHatch.isFluidEqual(mFluid)) {
                             remainingHatchSpace = outputHatch.getCapacity() - fluidInHatch.amount;
                         } else {
                             continue;
@@ -466,7 +489,7 @@ public boolean onRunningTick(ItemStack aStack) {
                     if (amountToFillHatch <= 0) {
                         continue;
                     }
-                    final FluidStack fillStack = fluidToOutput.copy();
+                    final FluidStack fillStack = mFluid.copy();
                     fillStack.amount = amountToFillHatch;
                     final int transferredAmount = outputHatch.fill(fillStack, true);
                     outputAmount -= transferredAmount;
@@ -499,7 +522,7 @@ public void construct(ItemStack stackSize, boolean hintsOnly) {
 
     @Override
     public boolean onSolderingToolRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
-            float aX, float aY, float aZ) {
+            float aX, float aY, float aZ, ItemStack toolStack) {
         if (side == getBaseMetaTileEntity().getFrontFacing()) {
             voidExcessEnabled ^= true;
             aPlayer.addChatMessage(
@@ -512,18 +535,18 @@ public boolean onSolderingToolRightClick(ForgeDirection side, ForgeDirection wre
 
     @Override
     public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer,
-            float aX, float aY, float aZ) {
+            float aX, float aY, float aZ, ItemStack toolStack) {
         if (side == getBaseMetaTileEntity().getFrontFacing()) {
-            if (mLockedFluidName == null || mLockedFluidName.equals("")) {
-                if (mFluidName != null && !mFluidName.equals("")) {
-                    mLockedFluidName = mFluidName;
+            if (mLockedFluid == null) {
+                if (mFluid != null) {
+                    mLockedFluid = mFluid;
                     aPlayer.addChatMessage(new ChatComponentTranslation("yottank.chat.1", getFluidName()));
                 } else {
                     aPlayer.addChatMessage(new ChatComponentTranslation("yottank.chat.2"));
                 }
                 isFluidLocked = true;
             } else {
-                mLockedFluidName = "";
+                mLockedFluid = null;
                 isFluidLocked = false;
                 aPlayer.addChatMessage(new ChatComponentTranslation("yottank.chat.0"));
             }
@@ -595,7 +618,7 @@ protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inve
                                         () -> StatCollector.translateToLocal("gui.YOTTank.1") + " " + getFluidName())
                                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                                 .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0))
-                .widget(new FakeSyncWidget.StringSyncer(() -> mFluidName, val -> mFluidName = val))
+                .widget(new FakeSyncWidget.FluidStackSyncer(() -> mFluid, val -> mFluid = val))
                 .widget(
                         new TextWidget()
                                 .setStringSupplier(
@@ -610,7 +633,7 @@ protected void drawTexts(DynamicPositionedColumn screenElements, SlotWidget inve
                                 () -> StatCollector.translateToLocal("gui.YOTTank.3") + " " + getLockedFluidName())
                                 .setDefaultColor(COLOR_TEXT_WHITE.get())
                                 .setEnabled(widget -> getBaseMetaTileEntity().getErrorDisplayID() == 0))
-                .widget(new FakeSyncWidget.StringSyncer(() -> mLockedFluidName, val -> mLockedFluidName = val))
+                .widget(new FakeSyncWidget.FluidStackSyncer(() -> mLockedFluid, val -> mLockedFluid = val))
                 .widget(new FakeSyncWidget.BooleanSyncer(() -> isFluidLocked, val -> isFluidLocked = val))
                 .widget(new FakeSyncWidget.BooleanSyncer(() -> voidExcessEnabled, val -> voidExcessEnabled = val));
     }
@@ -637,7 +660,7 @@ protected ButtonWidget createPowerPassButton() {
         return (ButtonWidget) new ButtonWidget().setOnClick((clickData, widget) -> {
             TecTech.proxy.playSound(getBaseMetaTileEntity(), "fx_click");
             isFluidLocked = !isFluidLocked;
-            if (!widget.getContext().isClient()) mLockedFluidName = isFluidLocked ? mFluidName : "";
+            if (!widget.getContext().isClient()) mLockedFluid = isFluidLocked ? mFluid : null;
         }).setPlayClickSound(false).setBackground(() -> {
             List<UITexture> ret = new ArrayList<>();
             ret.add(TecTechUITextures.BUTTON_STANDARD_16x16);