diff --git a/src/engine/devcmd/cmds/AddGoldCmd.java b/src/engine/devcmd/cmds/AddGoldCmd.java
index e998fc5b..9d15ad21 100644
--- a/src/engine/devcmd/cmds/AddGoldCmd.java
+++ b/src/engine/devcmd/cmds/AddGoldCmd.java
@@ -14,6 +14,7 @@ import engine.gameManager.ChatManager;
 import engine.objects.AbstractGameObject;
 import engine.objects.Item;
 import engine.objects.PlayerCharacter;
+import engine.server.MBServerStatics;
 
 /**
  * @author Eighty
@@ -46,10 +47,10 @@ public class AddGoldCmd extends AbstractDevCmd {
             throwbackError(pc, "Quantity must be a number, " + words[0] + " is invalid");
             return;
         }
-        if (amt < 1 || amt > 10000000) {
-            throwbackError(pc, "Quantity must be between 1 and 10000000 (10 million)");
+        if (amt < 1 || amt > MBServerStatics.PLAYER_GOLD_LIMIT) {
+            throwbackError(pc, "Quantity must be between 1 and " + MBServerStatics.PLAYER_GOLD_LIMIT);
             return;
-        } else if ((curAmt + amt) > 10000000) {
+        } else if ((curAmt + amt) > MBServerStatics.PLAYER_GOLD_LIMIT) {
             throwbackError(pc, "This would place your inventory over 10,000,000 gold.");
             return;
         }
diff --git a/src/engine/net/client/ClientMessagePump.java b/src/engine/net/client/ClientMessagePump.java
index d31a63c3..0c3fb616 100644
--- a/src/engine/net/client/ClientMessagePump.java
+++ b/src/engine/net/client/ClientMessagePump.java
@@ -1259,7 +1259,7 @@ public class ClientMessagePump implements NetMsgHandler {
 
                 cost *= profit;
 
-                if (gold.getNumOfItems() + cost > 10000000) {
+                if (gold.getNumOfItems() + cost > MBServerStatics.PLAYER_GOLD_LIMIT) {
                     return;
                 }
 
diff --git a/src/engine/objects/CharacterItemManager.java b/src/engine/objects/CharacterItemManager.java
index b4b6fcfa..9a4b22ab 100644
--- a/src/engine/objects/CharacterItemManager.java
+++ b/src/engine/objects/CharacterItemManager.java
@@ -2335,15 +2335,14 @@ public class CharacterItemManager {
         }
 
 
-        if (this.getGoldInventory().getNumOfItems() + goldFrom2 > 10000000) {
+        if (this.getGoldInventory().getNumOfItems() + goldFrom2 > MBServerStatics.PLAYER_GOLD_LIMIT) {
             PlayerCharacter pc = (PlayerCharacter) this.absCharacter;
             if (pc.getClientConnection() != null)
                 ErrorPopupMsg.sendErrorPopup(pc, 202);
             return false;
         }
 
-
-        if (tradingWith.getGoldInventory().getNumOfItems() + goldFrom1 > 10000000) {
+        if (tradingWith.getGoldInventory().getNumOfItems() + goldFrom1 > MBServerStatics.PLAYER_GOLD_LIMIT) {
             PlayerCharacter pc = (PlayerCharacter) tradingWith.absCharacter;
             if (pc.getClientConnection() != null)
                 ErrorPopupMsg.sendErrorPopup(pc, 202);
diff --git a/src/engine/objects/Warehouse.java b/src/engine/objects/Warehouse.java
index f96a5fcb..051973f6 100644
--- a/src/engine/objects/Warehouse.java
+++ b/src/engine/objects/Warehouse.java
@@ -99,7 +99,7 @@ public class Warehouse extends AbstractWorldObject {
 
     public static ConcurrentHashMap<Integer, Integer> getMaxResources() {
         if (maxResources.size() != 23) {
-            maxResources.put(7, 100000000);
+            maxResources.put(7, 1000000000);
             maxResources.put(1580000, 10000);
             maxResources.put(1580001, 2000);
             maxResources.put(1580002, 2000);
diff --git a/src/engine/server/MBServerStatics.java b/src/engine/server/MBServerStatics.java
index 80338e63..3d5596f6 100644
--- a/src/engine/server/MBServerStatics.java
+++ b/src/engine/server/MBServerStatics.java
@@ -33,11 +33,11 @@ public class MBServerStatics {
     // hit box
     // calcs
     public static final boolean PRINT_INCOMING_OPCODES = false; // print
-    public static final int BANK_GOLD_LIMIT = 25000000;
+    public static final int BANK_GOLD_LIMIT = 1000000000;
     // incoming
     // opcodes to
     // console
-    public static final int PLAYER_GOLD_LIMIT = 10000000;
+    public static final int PLAYER_GOLD_LIMIT = 500000000;
     // buildings, npcs
     /*
      * Login cache flags