diff --git a/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json b/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
index 5ae10a116e..1b851f587f 100644
--- a/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
+++ b/binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json
@@ -3,22 +3,18 @@
 	"autoResearch": true,
 	"description": "These stat modifications will be applied to advanced and elite units",
 	"modifications": [
-		{"value": "Health/Max",             "add": 10                         },
-		{"value": "Armour/Hack",            "add":  1                         },
-		{"value": "Armour/Pierce",          "add":  1                         },
-		{"value": "Armour/Crush",           "add":  1                         },
-		{"value": "UnitMotion/WalkSpeed",   "add": -0.5, "affects": "Infantry"},
-		{"value": "UnitMotion/WalkSpeed",   "add": -1,   "affects": "Cavalry" },
-		{"value": "Attack/Ranged/MaxRange", "add":  4,   "affects": "Ranged"  },
-		{"value": "Attack/Ranged/Spread",   "add": -0.2, "affects": "Ranged"  },
-		{"value": "Attack/Melee/Hack",      "add":  3,   "affects": "Sword"   },
-		{"value": "Attack/Melee/Hack",      "add":  1,   "affects": "Dog"     },
-		{"value": "Attack/Melee/Hack",      "add":  1,   "affects": "Spear"   },
-		{"value": "Attack/Melee/Pierce",    "add":  1.5, "affects": "Spear"   },
-		{"value": "Attack/Melee/Hack",      "add":  1,   "affects": "Pike"    },
-		{"value": "Attack/Melee/Pierce",    "add":  1.5, "affects": "Pike"    },
-		{"value": "Heal/Range",             "add":  5,   "affects": "Healer"  },
-		{"value": "Heal/HP",                "add":  3,   "affects": "Healer"  }
+		{"value": "Health/Max",             "multiply":    1.2                       },
+		{"value": "Armour/Hack",            "add":         1                         },
+		{"value": "Armour/Pierce",          "add":         1                         },
+		{"value": "Armour/Crush",           "add":         1                         },
+		{"value": "UnitMotion/WalkSpeed",   "add":         0.5, "affects": "Infantry"},
+		{"value": "UnitMotion/WalkSpeed",   "add":         1,   "affects": "Cavalry" },
+		{"value": "Attack/Ranged/MaxRange", "add":         4,   "affects": "Ranged"  },
+		{"value": "Attack/Ranged/Spread",   "multiply":    0.95,"affects": "Ranged"  },
+		{"value": "Attack/Melee/Hack",      "multiply":    1.2,  "affects": "Melee"  },
+		{"value": "Attack/Melee/Pierce",    "multiply":    1.2,  "affects": "Melee"  },
+		{"value": "Heal/Range",             "add":         4,   "affects": "Healer"  },
+		{"value": "Heal/HP",                "add":         5,   "affects": "Healer"  }
 	],
 	"affects": ["Advanced Unit", "Elite Unit"]
 }
diff --git a/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json b/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
index 295b0e1352..6b76f91300 100644
--- a/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
+++ b/binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json
@@ -3,22 +3,18 @@
 	"autoResearch": true,
 	"description": "These stat modifications will be applied to elite units",
 	"modifications": [
-		{"value": "Health/Max",             "add": 10                         },
-		{"value": "Armour/Hack",            "add":  1                         },
-		{"value": "Armour/Pierce",          "add":  1                         },
-		{"value": "Armour/Crush",           "add":  1                         },
-		{"value": "UnitMotion/WalkSpeed",   "add": -0.5, "affects": "Infantry"},
-		{"value": "UnitMotion/WalkSpeed",   "add": -1,   "affects": "Cavalry" },
-		{"value": "Attack/Ranged/MaxRange", "add":  4,   "affects": "Ranged"  },
-		{"value": "Attack/Ranged/Spread",   "add": -0.2, "affects": "Ranged"  },
-		{"value": "Attack/Melee/Hack",      "add":  3,   "affects": "Sword"   },
-		{"value": "Attack/Melee/Hack",      "add":  1,   "affects": "Dog"     },
-		{"value": "Attack/Melee/Hack",      "add":  1,   "affects": "Spear"   },
-		{"value": "Attack/Melee/Pierce",    "add":  1.5, "affects": "Spear"   },
-		{"value": "Attack/Melee/Hack",      "add":  1,   "affects": "Pike"    },
-		{"value": "Attack/Melee/Pierce",    "add":  1.5, "affects": "Pike"    },
-		{"value": "Heal/Range",             "add":  5,   "affects": "Healer"  },
-		{"value": "Heal/HP",                "add":  3,   "affects": "Healer"  }
+		{"value": "Health/Max",             "multiply":    1.2                       },
+		{"value": "Armour/Hack",            "add":         1                         },
+		{"value": "Armour/Pierce",          "add":         1                         },
+		{"value": "Armour/Crush",           "add":         1                         },
+		{"value": "UnitMotion/WalkSpeed",   "add":         0.5, "affects": "Infantry"},
+		{"value": "UnitMotion/WalkSpeed",   "add":         1,   "affects": "Cavalry" },
+		{"value": "Attack/Ranged/MaxRange", "add":         4,   "affects": "Ranged"  },
+		{"value": "Attack/Ranged/Spread",   "multiply":    0.95,"affects": "Ranged"  },
+		{"value": "Attack/Melee/Hack",      "multiply":    1.2,  "affects": "Melee"  },
+		{"value": "Attack/Melee/Pierce",    "multiply":    1.2,  "affects": "Melee"  },
+		{"value": "Heal/Range",             "add":         4,   "affects": "Healer"  },
+		{"value": "Heal/HP",                "add":         5,   "affects": "Healer"  }
 	],
 	"affects": ["Elite Unit"]
 }
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
index ee864d4413..0a2c2bdc56 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -55,7 +55,7 @@
     <Anchor>pitch</Anchor>
   </Position>
   <Promotion>
-    <RequiredXp>15000000</RequiredXp>
+    <RequiredXp>150</RequiredXp>
   </Promotion>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
index 88727cf23c..ec88e33300 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
@@ -24,9 +24,6 @@
       formations/skirmish
     </Formations>
   </Identity>
-  <Promotion>
-    <RequiredXp>20000000</RequiredXp>
-  </Promotion>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index b48d36d277..ad6a29006a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -72,7 +72,7 @@
   </Loot>
   <Looter/>
   <Promotion>
-    <RequiredXp>100000000</RequiredXp>
+    <RequiredXp>100</RequiredXp>
   </Promotion>
   <ResourceGatherer>
     <MaxDistance>2.0</MaxDistance>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
index 787869fee7..ae638fc532 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged.xml
@@ -29,9 +29,6 @@
       formations/skirmish
     </Formations>
   </Identity>
-  <Promotion>
-    <RequiredXp>15000000</RequiredXp>
-  </Promotion>
   <Sound>
     <SoundGroups>
       <attack>attack/weapon/arrowfly.xml</attack>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
index cca9355b82..7388fd78ae 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_e.xml
@@ -1,30 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="units/mace_champion_infantry_a">
-  <Attack>
-    <Melee>
-      <Hack>8.5</Hack>
-      <Pierce>17</Pierce>
-    </Melee>
-    <Charge>
-      <Hack>16.0</Hack>
-      <Pierce>48.0</Pierce>
-      <MaxRange>6.0</MaxRange>
-    </Charge>
-  </Attack>
   <Health>
-    <Max>145</Max>
+    <Max>240</Max>
   </Health>
   <Identity>
     <SpecificName>Hypaspistḗs Argyraspídi</SpecificName>
     <Icon>units/macedonian_argyraspidai.png</Icon>
   </Identity>
   <Promotion disable=""/>
-  <UnitMotion>
-    <WalkSpeed>8</WalkSpeed>
-    <Run>
-      <Speed>15.0</Speed>
-    </Run>
-  </UnitMotion>
   <VisualActor>
     <Actor>units/macedonians/mace_champion_argyraspis.xml</Actor>
   </VisualActor>