diff --git a/2006Redone Server/src/redone/game/bots/BotHandler.java b/2006Redone Server/src/redone/game/bots/BotHandler.java
index c56d47ce..90c95886 100644
--- a/2006Redone Server/src/redone/game/bots/BotHandler.java	
+++ b/2006Redone Server/src/redone/game/bots/BotHandler.java	
@@ -30,6 +30,12 @@ public class BotHandler
     }
 
     public static void playerShop(Client player){
+        // Must be in the correct zones
+        if (!player.inPlayerShopArea() && !player.inBankArea()) {
+            player.getActionSender().sendMessage("You need to be in a bank zone or trade area for this.");
+            return;
+        }
+
         Client playerShop = getPlayerShop(player);
 
         if (playerShop == null) {
@@ -182,5 +188,4 @@ public class BotHandler
             }
         }
     }
-
 }
diff --git a/2006Redone Server/src/redone/game/players/Player.java b/2006Redone Server/src/redone/game/players/Player.java
index 77b0376a..a4fc96f0 100644
--- a/2006Redone Server/src/redone/game/players/Player.java	
+++ b/2006Redone Server/src/redone/game/players/Player.java	
@@ -621,6 +621,26 @@ public abstract class Player {
 				isInArea(3422,2895,3433,2885) || //Nardah
 				isInArea(3685,3473,3694,3461) || //Phasmatys
                 isInArea(2530,4725,2550,4705) || //Phasmatys
+				isInArea(2834, 10215, 2841, 10204) || // Keldagrim
+				isInArea(2379, 4453, 2386, 4462) || // Zanaris
+				false;
+	}
+
+	public boolean inPlayerShopArea() {
+		return isInArea(2938, 3389, 3059, 3329) || // Falador
+				isInArea(3172, 3449, 3270, 3384) || // Varrock
+				isInArea(3200, 3256, 3237, 3201) || // Lumbridge
+				isInArea(2716, 3498, 2735, 3480) ||
+				isInArea(3075, 3513, 3106, 3466) ||
+				isInArea(3074, 3262, 3102, 3239) ||
+				isInArea(2435, 3101, 2459, 3080) ||
+				isInArea(2618, 3075, 2598, 3108) ||
+				isInArea(2678, 3267, 2601, 3341) ||
+				isInArea(3265, 3157, 3324, 3215) ||
+				isInArea(3386, 3264, 3348, 3286) ||
+				isInArea(2797, 3454, 2838, 3430) ||
+				isInArea(2546, 3157, 2512, 3176) ||
+				isInArea(2451, 3408, 2425, 3437) ||
 				false;
 	}
 
diff --git a/2006Redone Server/src/redone/game/shops/ShopAssistant.java b/2006Redone Server/src/redone/game/shops/ShopAssistant.java
index a220b26b..ef1ea0b5 100644
--- a/2006Redone Server/src/redone/game/shops/ShopAssistant.java	
+++ b/2006Redone Server/src/redone/game/shops/ShopAssistant.java	
@@ -472,7 +472,6 @@ public class ShopAssistant {
 		boolean isStackable = ItemDefinitions.getDef()[itemID].isStackable;
 		int freeSlots = player.getItemAssistant().freeSlots();
 		int storeQty = ShopHandler.getStock(shopID, itemID);
-		System.out.println("Item " + itemID + " stock = " + storeQty);
 		if (amount > 0) {
 			if (storeQty <= 0) {
 				// none in stock, or not sold here
diff --git a/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class b/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class
index 98a295b2..1513ea48 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class and b/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Player.class b/CompiledServer/production/2006rebotted/redone/game/players/Player.class
index 30bf91b4..8ce01019 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Player.class and b/CompiledServer/production/2006rebotted/redone/game/players/Player.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class b/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class
index d959acde..b1ad6174 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class and b/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class differ