diff --git a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntity.java
index 737e909..0990b66 100644
--- a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntity.java
@@ -1411,10 +1411,9 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
 	
     public boolean isAddedToEnergyNet() {return mIsAddedToEnet;}
 	public void setStored(int aEU) {if (hasValidMetaTileEntity()) setStoredEU(aEU);}
-	public int demandsEnergy() {if (mReleaseEnergy || !hasValidMetaTileEntity() || !mMetaTileEntity.isEnetInput()) return 0; return getCapacity() - getStored();}
+	public double getDemandedEnergy() {if (mReleaseEnergy || !hasValidMetaTileEntity() || !mMetaTileEntity.isEnetInput()) return 0; return getCapacity() - getStored();}
 	public int getCapacity() {return getEUCapacity();}
     public int getStored() {return Math.min(getStoredEU(), getCapacity());}
-	public int getMaxSafeInput() {return getInputVoltage();}
 	public int getMaxEnergyOutput() {if (mReleaseEnergy) return Integer.MAX_VALUE; return getOutput();}
 	public int getOutput() {return getOutputVoltage();}
 	
@@ -1457,4 +1456,12 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
 	public byte setColorization(byte aColor) {
 		return mColor = (byte)(aColor+1);
 	}
+	
+	public int getSinkTier() {
+		return mMetaTileEntity.getInputTier();
+	}
+
+	public int getSourceTier() {
+		return mMetaTileEntity.getOutputTier();
+	}
 }
\ No newline at end of file
diff --git a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityIC.java b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityIC.java
index 7772026..495efca 100644
--- a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityIC.java
+++ b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityIC.java
@@ -19,22 +19,4 @@ public class BaseMetaTileEntityIC extends BaseMetaTileEntity implements IIC2Tile
 	public boolean isTeleporterCompatible(Direction aSide) {return hasValidMetaTileEntity() && mMetaTileEntity.isTeleporterCompatible();}
 	public boolean acceptsEnergyFrom(TileEntity aReceiver, Direction aDirection) {return inputEnergyFrom((byte)aDirection.toSideValue());}
     public boolean emitsEnergyTo(TileEntity aReceiver, Direction aDirection) {return outputsEnergyTo((byte)aDirection.toSideValue());}
-
-	@Override
-	public double getDemandedEnergy() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public int getSinkTier() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public int getSourceTier() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
 }
\ No newline at end of file
diff --git a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityICMJ.java b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityICMJ.java
index 752929d..50ff571 100644
--- a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityICMJ.java
+++ b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityICMJ.java
@@ -19,22 +19,4 @@ public class BaseMetaTileEntityICMJ extends BaseMetaTileEntityMJ implements IIC2
 	public boolean isTeleporterCompatible(Direction aSide) {return hasValidMetaTileEntity() && mMetaTileEntity.isTeleporterCompatible();}
 	public boolean acceptsEnergyFrom(TileEntity aReceiver, Direction aDirection) {return inputEnergyFrom((byte)aDirection.toSideValue());}
     public boolean emitsEnergyTo(TileEntity aReceiver, Direction aDirection) {return outputsEnergyTo((byte)aDirection.toSideValue());}
-
-	@Override
-	public double getDemandedEnergy() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public int getSinkTier() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public int getSourceTier() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
 }
\ No newline at end of file
diff --git a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityICUE.java b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityICUE.java
index ad2a11c..2af9ef3 100644
--- a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityICUE.java
+++ b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityICUE.java
@@ -19,22 +19,4 @@ public class BaseMetaTileEntityICUE extends BaseMetaTileEntityUE implements IIC2
 	public boolean isTeleporterCompatible(Direction aSide) {return hasValidMetaTileEntity() && mMetaTileEntity.isTeleporterCompatible();}
 	public boolean acceptsEnergyFrom(TileEntity aReceiver, Direction aDirection) {return inputEnergyFrom((byte)aDirection.toSideValue());}
     public boolean emitsEnergyTo(TileEntity aReceiver, Direction aDirection) {return outputsEnergyTo((byte)aDirection.toSideValue());}
-
-	@Override
-	public double getDemandedEnergy() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public int getSinkTier() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public int getSourceTier() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
 }
\ No newline at end of file
diff --git a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityICUEMJ.java b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityICUEMJ.java
index 98a0370..e6b4e55 100644
--- a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityICUEMJ.java
+++ b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityICUEMJ.java
@@ -19,22 +19,4 @@ public class BaseMetaTileEntityICUEMJ extends BaseMetaTileEntityUEMJ implements
 	public boolean isTeleporterCompatible(Direction aSide) {return hasValidMetaTileEntity() && mMetaTileEntity.isTeleporterCompatible();}
 	public boolean acceptsEnergyFrom(TileEntity aReceiver, Direction aDirection) {return inputEnergyFrom((byte)aDirection.toSideValue());}
     public boolean emitsEnergyTo(TileEntity aReceiver, Direction aDirection) {return outputsEnergyTo((byte)aDirection.toSideValue());}
-
-	@Override
-	public double getDemandedEnergy() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public int getSinkTier() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	@Override
-	public int getSourceTier() {
-		// TODO Auto-generated method stub
-		return 0;
-	}
 }
\ No newline at end of file
diff --git a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityMJ.java b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityMJ.java
index 2c49233..fe8502c 100644
--- a/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityMJ.java
+++ b/src/main/java/gregtechmod/api/metatileentity/BaseMetaTileEntityMJ.java
@@ -8,7 +8,7 @@ package gregtechmod.api.metatileentity;
  */
 public class BaseMetaTileEntityMJ extends BaseMetaTileEntity /*implements IBCTileEntity*/ {
 	/*
-	IPowerProvider mProvider;
+	IPowerProvider mProvider; // TODO RF api
 	
 	public BaseMetaTileEntityMJ() {
 		super();