diff --git a/src/main/scala/net/machinemuse/powersuits/item/ItemPowerFist.scala b/src/main/scala/net/machinemuse/powersuits/item/ItemPowerFist.scala
index 30e8911..ceda5eb 100644
--- a/src/main/scala/net/machinemuse/powersuits/item/ItemPowerFist.scala
+++ b/src/main/scala/net/machinemuse/powersuits/item/ItemPowerFist.scala
@@ -22,6 +22,7 @@ import net.minecraft.item.Item.ToolMaterial
 import net.minecraft.item.{EnumAction, ItemStack}
 import net.minecraft.util.{DamageSource, Vec3}
 import net.minecraft.world.World
+import powercrystals.minefactoryreloaded.api.IMFRHammer
 
 /**
  * Describes the modular power tool.
@@ -37,6 +38,7 @@ class ItemPowerFist extends ItemElectricTool(0, ToolMaterial.EMERALD)
 with IModularItem
 with IToolGrafter
 with IToolHammer
+with IMFRHammer
 with IToolCrowbar
 with ModeChangingModularItem {
   val iconpath: String = MuseIcon.ICON_PREFIX + "handitem"
@@ -259,4 +261,5 @@ with ModeChangingModularItem {
 
   // Railcraft Crowbar
   override def onBoost(player: EntityPlayer, itemStack: ItemStack, entityMinecart: EntityMinecart): Unit = {}
+
 }
diff --git a/src/main/scala/net/machinemuse/powersuits/powermodule/tool/OmniWrenchModule.java b/src/main/scala/net/machinemuse/powersuits/powermodule/tool/OmniWrenchModule.java
index a5f8fba..2261ef1 100644
--- a/src/main/scala/net/machinemuse/powersuits/powermodule/tool/OmniWrenchModule.java
+++ b/src/main/scala/net/machinemuse/powersuits/powermodule/tool/OmniWrenchModule.java
@@ -1,9 +1,7 @@
 package net.machinemuse.powersuits.powermodule.tool;
 
-import cpw.mods.fml.common.registry.GameRegistry;
 import net.machinemuse.api.IModularItem;
 import net.machinemuse.api.moduletrigger.IRightClickModule;
-import net.machinemuse.powersuits.common.ModCompatability;
 import net.machinemuse.powersuits.item.ItemComponent;
 import net.machinemuse.powersuits.powermodule.PowerModuleBase;
 import net.machinemuse.utils.MuseCommonStrings;
@@ -25,12 +23,9 @@ public class OmniWrenchModule extends PowerModuleBase implements IRightClickModu
 
     public OmniWrenchModule(List<IModularItem> validItems) {
         super(validItems);
-        if (ModCompatability.isOmniToolsLoaded() && GameRegistry.findItemStack("OmniTools", "OmniWrench", 1) != null) {
-            addInstallCost(GameRegistry.findItemStack("OmniTools", "OmniWrench", 1));
-        } else {
-            addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.controlCircuit, 1));
-            addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.servoMotor, 2));
-        }
+
+        addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.controlCircuit, 1));
+        addInstallCost(MuseItemUtils.copyAndResize(ItemComponent.servoMotor, 2));
     }
 
     @Override