diff --git a/src/engine/objects/NPC.java b/src/engine/objects/NPC.java
index 0eeefd3d..1419f413 100644
--- a/src/engine/objects/NPC.java
+++ b/src/engine/objects/NPC.java
@@ -1100,7 +1100,7 @@ public class NPC extends AbstractCharacter {
             return 600;
 
         float rank = this.building.getRank() - 1;
-        float rate = (float) (2.5 * rank);
+        float rate = (float) (Float.parseFloat(ConfigManager.MB_PRODUCTION_RATE.getValue()) * rank);
         time = (20 - rate);
         time *= 60;
         return (int) time;
@@ -1139,8 +1139,12 @@ public class NPC extends AbstractCharacter {
 
         upgradeCost = Integer.MAX_VALUE;
 
-        if (this.getRank() < 7)
+        if (this.getRank() < 7) {
+            if(this.contract.isTrainer()){
+                return (this.getRank() * 25162) + 5362;
+            }
             return (this.getRank() * 100650) + 21450;
+        }
 
         return upgradeCost;
     }