diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
index 4f638b62..a6e3745b 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
@@ -1,22 +1,31 @@
 package StevenDimDoors.mod_pocketDim;
 
 import paulscode.sound.SoundSystem;
+import net.minecraft.block.Block;
 import net.minecraft.client.audio.SoundManager;
 import net.minecraft.client.audio.SoundPool;
 import net.minecraft.client.audio.SoundPoolEntry;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemDoor;
+import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChunkCoordinates;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.sound.PlayBackgroundMusicEvent;
 import net.minecraftforge.client.event.sound.SoundLoadEvent;
+import net.minecraftforge.event.Event;
 import net.minecraftforge.event.EventPriority;
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingFallEvent;
+import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.WorldEvent;
+import StevenDimDoors.mod_pocketDim.blocks.IDimDoor;
 import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
+import StevenDimDoors.mod_pocketDim.items.BaseItemDoor;
 import StevenDimDoors.mod_pocketDim.ticking.RiftRegenerator;
 import StevenDimDoors.mod_pocketDim.util.Point4D;
 import StevenDimDoors.mod_pocketDim.world.LimboProvider;
@@ -58,6 +67,52 @@ public class EventHookContainer
         	this.playMusicForDim(FMLClientHandler.instance().getClient().thePlayer.worldObj);
         }
 	}
+	
+	
+	@ForgeSubscribe
+	public void onPlayerEvent(PlayerInteractEvent event)
+	{
+		//Handle placement of vanilla doors on rifts
+		if(!event.entity.worldObj.isRemote)
+		{
+			World world = event.entity.worldObj;
+			ItemStack item = event.entityPlayer.inventory.getCurrentItem();
+			if(item!=null)
+			{
+				if(item.getItem() instanceof ItemDoor&&!(item.getItem() instanceof BaseItemDoor))
+				{
+					Block doorToPlace = null; 
+					if(item.itemID == Item.doorIron.itemID)
+					{
+						doorToPlace =mod_pocketDim.dimensionalDoor;
+					}
+					else if(item.itemID == Item.doorWood.itemID)
+					{
+						doorToPlace =mod_pocketDim.warpDoor;
+					}
+					else if(item.itemID == mod_pocketDim.itemGoldenDoor.itemID)
+					{
+						doorToPlace =mod_pocketDim.goldenDimensionalDoor;
+					}
+					if(((BaseItemDoor) mod_pocketDim.itemDimensionalDoor).tryPlacingDoor(doorToPlace, world, event.entityPlayer,item))
+					{
+						if(!event.entityPlayer.capabilities.isCreativeMode)
+						{
+							item.stackSize--;
+						}
+						if(!event.entity.worldObj.isRemote)
+						{
+							event.setCanceled(true);
+						}
+					}
+					else
+					{
+						BaseItemDoor.tryItemUse(doorToPlace, item, event.entityPlayer, world, event.x, event.y, event.z, event.face, true, true);
+					}
+				}
+			}
+		}
+	}	          
     @ForgeSubscribe
     public void onWorldLoad(WorldEvent.Load event)
     {
@@ -134,8 +189,6 @@ public class EventHookContainer
 	    		{
 	    			sndManager.sndSystem.backgroundMusic("LimboMusic", soundPoolEntry.getSoundUrl(), soundPoolEntry.getSoundName(), false);
 	    			sndManager.sndSystem.play("LimboMusic");
-	    			sndManager.sndSystem.setVolume("BgMusic", sndManager.sndSystem.getMasterVolume()+5);
-
 	    		}
 	    	}
 	    	else if(!(world.provider instanceof LimboProvider))
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java
index f75aedff..f8869ea9 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java
@@ -30,7 +30,6 @@ public class DimensionalDoor extends BaseDimDoor
 				dimension.createLink(x, y, z, LinkTypes.POCKET,world.getBlockMetadata(x, y - 1, z));
 			}
 		}
-		
 	}
 	@Override
 	public int getDrops()
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java
index a3863d80..86512702 100644
--- a/src/main/java/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java
@@ -15,6 +15,8 @@ import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
+import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoor;
+
 
 public abstract class BaseItemDoor extends ItemDoor
 {
@@ -83,7 +85,7 @@ public abstract class BaseItemDoor extends ItemDoor
 			return false;
 		}
 
-		MovingObjectPosition hit = this.getMovingObjectPositionFromPlayer(player.worldObj, player, true);
+		MovingObjectPosition hit = getMovingObjectPositionFromPlayer(player.worldObj, player, true);
 		if (hit != null)
 		{
 			if (world.getBlockId(hit.blockX, hit.blockY, hit.blockZ) == properties.RiftBlockID)
@@ -101,6 +103,10 @@ public abstract class BaseItemDoor extends ItemDoor
 						{
 							int orientation = MathHelper.floor_double(((player.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3;
 							placeDoorBlock(world, x, y - 1, z, orientation, doorBlock);
+							if(!(item.getItem() instanceof BaseItemDoor))
+							{
+								((TileEntityDimDoor)world.getBlockTileEntity(x, y, z)).hasGennedPair=true;
+							}
 							return true;
 						}
 					}