diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java
index 00bdfb28..6efc6119 100644
--- a/src/engine/objects/Mob.java
+++ b/src/engine/objects/Mob.java
@@ -1885,7 +1885,8 @@ public class Mob extends AbstractIntelligenceAgent {
                 if (!building.transferGold(-rankCost, false))
                     return;
 
-                DateTime dateToUpgrade = DateTime.now().plusHours(Mob.getUpgradeTime(this));
+                //DateTime dateToUpgrade = DateTime.now().plusHours(Mob.getUpgradeTime(this));
+                DateTime dateToUpgrade = DateTime.now().plusMinutes(5);
                 Mob.setUpgradeDateTime(this, dateToUpgrade);
 
                 // Schedule upgrade job
diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java
index 07775e33..abc99255 100644
--- a/src/engine/objects/NPC.java
+++ b/src/engine/objects/NPC.java
@@ -1325,8 +1325,8 @@ public class NPC extends AbstractCharacter {
                 if (!building.transferGold(-rankCost, false))
                     return;
 
-                dateToUpgrade = DateTime.now().plusHours(this.getUpgradeTime());
-
+                //dateToUpgrade = DateTime.now().plusHours(this.getUpgradeTime());
+                dateToUpgrade = DateTime.now().plusMinutes(5);
                 this.setUpgradeDateTime(dateToUpgrade);
 
                 // Schedule upgrade job