diff --git a/core/Registration.java b/core/Registration.java
index a72e1c86d..54800a692 100644
--- a/core/Registration.java
+++ b/core/Registration.java
@@ -566,9 +566,6 @@ public class Registration
 
 		AEApi.instance().registries().matterCannon().registerAmmo( AEApi.instance().materials().materialMatterBall.stack( 1 ), 32.0 );
 
-		// default settings..
-		((P2PTunnelRegistry) AEApi.instance().registries().p2pTunnel()).configure();
-
 		recipeHandler.injectRecipes();
 
 		if ( AEConfig.instance.isFeatureEnabled( AEFeature.enableDisassemblyCrafting ) )
@@ -582,6 +579,9 @@ public class Registration
 	{
 		registerSpatial( true );
 
+		// default settings..
+		((P2PTunnelRegistry) AEApi.instance().registries().p2pTunnel()).configure();
+
 		// add to localizaiton..
 		PlayerMessages.values();
 		GuiText.values();
diff --git a/core/features/registries/P2PTunnelRegistry.java b/core/features/registries/P2PTunnelRegistry.java
index 2635150ea..8b66b2838 100644
--- a/core/features/registries/P2PTunnelRegistry.java
+++ b/core/features/registries/P2PTunnelRegistry.java
@@ -53,6 +53,7 @@ public class P2PTunnelRegistry implements IP2PTunnelRegistry
 		addNewAttunement( new ItemStack( Blocks.redstone_wire ), TunnelType.REDSTONE );
 		addNewAttunement( new ItemStack( Blocks.redstone_block ), TunnelType.REDSTONE );
 		addNewAttunement( new ItemStack( Blocks.lever ), TunnelType.REDSTONE );
+		addNewAttunement( getModItem( "EnderIO", "itemRedstoneConduit", OreDictionary.WILDCARD_VALUE ), TunnelType.REDSTONE );
 
 		/**
 		 * attune based on lots of random item related stuff
@@ -69,6 +70,8 @@ public class P2PTunnelRegistry implements IP2PTunnelRegistry
 		addNewAttunement( new ItemStack( Blocks.chest ), TunnelType.ITEM );
 		addNewAttunement( new ItemStack( Blocks.trapped_chest ), TunnelType.ITEM );
 		addNewAttunement( getModItem( "ExtraUtilities", "extractor_base", 0 ), TunnelType.ITEM );
+		addNewAttunement( getModItem( "Mekanism", "PartTransmitter", 9 ), TunnelType.ITEM );
+		addNewAttunement( getModItem( "EnderIO", "itemItemConduit", OreDictionary.WILDCARD_VALUE ), TunnelType.ITEM );
 
 		/**
 		 * attune based on lots of random item related stuff
@@ -77,7 +80,11 @@ public class P2PTunnelRegistry implements IP2PTunnelRegistry
 		addNewAttunement( new ItemStack( Items.lava_bucket ), TunnelType.FLUID );
 		addNewAttunement( new ItemStack( Items.milk_bucket ), TunnelType.FLUID );
 		addNewAttunement( new ItemStack( Items.water_bucket ), TunnelType.FLUID );
+		addNewAttunement( getModItem( "Mekanism", "MachineBlock2", 11 ), TunnelType.FLUID );
+		addNewAttunement( getModItem( "Mekanism", "PartTransmitter", 4 ), TunnelType.FLUID );
 		addNewAttunement( getModItem( "ExtraUtilities", "extractor_base", 6 ), TunnelType.FLUID );
+		addNewAttunement( getModItem( "ExtraUtilities", "drum", OreDictionary.WILDCARD_VALUE ), TunnelType.FLUID );
+		addNewAttunement( getModItem( "EnderIO", "itemLiquidConduit", OreDictionary.WILDCARD_VALUE ), TunnelType.FLUID );
 
 		for (AEColor c : AEColor.values())
 		{
diff --git a/integration/modules/RF.java b/integration/modules/RF.java
index ed080f289..d0b7536da 100644
--- a/integration/modules/RF.java
+++ b/integration/modules/RF.java
@@ -4,7 +4,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 import appeng.api.AEApi;
 import appeng.api.config.TunnelType;
-import appeng.api.features.IP2PTunnelRegistry;
 import appeng.integration.BaseModule;
 import appeng.integration.IIntegrationModule;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -22,30 +21,32 @@ public class RF extends BaseModule implements IIntegrationModule
 	@Override
 	public void Init()
 	{
-		IP2PTunnelRegistry reg = AEApi.instance().registries().p2pTunnel();
+	}
 
-		ItemStack energyPipe = GameRegistry.findItemStack( "ExtraUtilities", "extractor_base", 1 );
-		if ( energyPipe != null )
+	void RFStack(String mod, String name, int dmg)
+	{
+		ItemStack modItem = GameRegistry.findItemStack( mod, name, 1 );
+		if ( modItem != null )
 		{
-			energyPipe.setItemDamage( 12 );
-			reg.addNewAttunement( energyPipe, TunnelType.RF_POWER );
+			modItem.setItemDamage( dmg );
+			AEApi.instance().registries().p2pTunnel().addNewAttunement( modItem, TunnelType.RF_POWER );
 		}
-
-		ItemStack energyConduit = GameRegistry.findItemStack( "EnderIO", "itemPowerConduit", 1 );
-		if ( energyConduit != null )
-		{
-			energyConduit.setItemDamage( OreDictionary.WILDCARD_VALUE );
-			reg.addNewAttunement( energyConduit, TunnelType.RF_POWER );
-		}
-
-		reg.addNewAttunement( GameRegistry.findItemStack( "EnderIO", "blockCapacitorBank", 1 ), TunnelType.RF_POWER );
-		reg.addNewAttunement( GameRegistry.findItemStack( "EnderIO", "blockPowerMonitor", 1 ), TunnelType.RF_POWER );
 	}
 
 	@Override
 	public void PostInit()
 	{
+		RFStack( "ExtraUtilities", "extractor_base", 12 );
+		RFStack( "ExtraUtilities", "pipes", 11 );
+		RFStack( "ExtraUtilities", "pipes", 14 );
+		RFStack( "ExtraUtilities", "generator", OreDictionary.WILDCARD_VALUE );
 
+		RFStack( "ThermalExpansion", "Cell", OreDictionary.WILDCARD_VALUE );
+		RFStack( "ThermalExpansion", "Dynamo", OreDictionary.WILDCARD_VALUE );
+
+		RFStack( "EnderIO", "itemPowerConduit", OreDictionary.WILDCARD_VALUE );
+		RFStack( "EnderIO", "blockCapacitorBank", 0 );
+		RFStack( "EnderIO", "blockPowerMonitor", 0 );
 	}
 
 }
diff --git a/parts/p2p/PartP2PTunnel.java b/parts/p2p/PartP2PTunnel.java
index b207a04dd..b77f9ade6 100644
--- a/parts/p2p/PartP2PTunnel.java
+++ b/parts/p2p/PartP2PTunnel.java
@@ -70,6 +70,9 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
 	{
 		ItemStack is = player.inventory.getCurrentItem();
 
+		// UniqueIdentifier id = GameRegistry.findUniqueIdentifierFor( is.getItem() );
+		// AELog.info( "ID:" + id.toString() + " : " + is.getItemDamage() );
+
 		TunnelType tt = AEApi.instance().registries().p2pTunnel().getTunnelTypeByItem( is );
 		if ( is != null && is.getItem() instanceof IMemoryCard )
 		{