diff --git a/src/classes/guildUpgrades/AutoFinishQuestsUpgrade.ts b/src/classes/guildUpgrades/AutoFinishQuestsUpgrade.ts
index a709487..32878c2 100644
--- a/src/classes/guildUpgrades/AutoFinishQuestsUpgrade.ts
+++ b/src/classes/guildUpgrades/AutoFinishQuestsUpgrade.ts
@@ -20,8 +20,26 @@ export default class AutoFinishQuestsUpgrade extends GuildUpgrade implements Max
     }
 
     getCostForLevel(level: number): number {
-        const scalingFactor = Math.pow(4.2, level - 1);
-        return Math.floor(25000 * scalingFactor * Math.pow(level, 1.05));
+        switch (level) {
+            case 1:
+                return 25000;
+            case 2:
+                return 50000;
+            case 3:
+                return 75000;
+            case 4:
+                return 150000;
+            case 5:
+                return 275000;
+            case 6:
+                return 750000;
+            case 7:
+                return 1500000;
+            case 8:
+                return 2500000;
+            default:
+                return 0;
+        }
     }
 
     isMaxLevel(): boolean {
diff --git a/src/classes/guildUpgrades/QuestExpUpgrade.ts b/src/classes/guildUpgrades/QuestExpUpgrade.ts
index e9391dc..fc12ed7 100644
--- a/src/classes/guildUpgrades/QuestExpUpgrade.ts
+++ b/src/classes/guildUpgrades/QuestExpUpgrade.ts
@@ -14,8 +14,8 @@ export default class QuestExpUpgrade extends GuildUpgrade {
   }
 
   getCostForLevel(level: number): number {
-    const scalingFactor = Math.pow(1.05, level - 1);
-    return Math.floor(2500000 * scalingFactor * Math.pow(level, 1.01));
+    if (level === 1) return 1000000;
+    return Math.floor(1000000 * (level * 1.05));
   }
 
   getModifier(): number {
diff --git a/src/classes/guildUpgrades/QuestGoldUpgrade.ts b/src/classes/guildUpgrades/QuestGoldUpgrade.ts
index c069150..d3e0cf1 100644
--- a/src/classes/guildUpgrades/QuestGoldUpgrade.ts
+++ b/src/classes/guildUpgrades/QuestGoldUpgrade.ts
@@ -14,8 +14,8 @@ export default class QuestGoldUpgrade extends GuildUpgrade {
   }
 
   getCostForLevel(level: number): number {
-    const scalingFactor = Math.pow(1.05, level - 1);
-    return Math.floor(2500000 * scalingFactor * Math.pow(level, 1.01));
+    if (level === 1) return 1000000;
+    return Math.floor(1000000 * (level * 1.05));
   }
 
   getModifier(): number {
diff --git a/src/components/UpgradesList.vue b/src/components/UpgradesList.vue
index 1920014..d6e0507 100644
--- a/src/components/UpgradesList.vue
+++ b/src/components/UpgradesList.vue
@@ -27,7 +27,7 @@
       </button>
     </div>
     <div class="upgrade" v-if="guild.level >= guild.expModifier.guildLevelRequirement">
-      <span>Quest exp modifier (level {{ guild.expModifier.level }})</span>
+      <span>Quest exp modifier (level {{ guild.expModifier.level - 1 }})</span>
       <small>Increases exp from newly offered quests by 10% per level</small>
       <button
           class="button metal"
@@ -39,7 +39,7 @@
       </button>
     </div>
     <div class="upgrade" v-if="guild.level >= guild.goldModifier.guildLevelRequirement">
-      <span>Quest gold modifier (level {{ guild.goldModifier.level }})</span>
+      <span>Quest gold modifier (level {{ guild.goldModifier.level - 1 }})</span>
       <small>Increases gold from newly offered quests by 10% per level</small>
       <button
           class="button metal"