Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/upgrade_rank_advanced_mercenary.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/upgrade_rank_advanced_mercenary.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/upgrade_rank_advanced_mercenary.json
@@ -1,31 +1,11 @@
 {
+	"autoResearch": true,
 	"genericName": "Expertise In War",
 	"description": "Hire professional mercenaries to fight in your army.",
-	"cost": {
-		"metal": 600
-	},
-	"requirements": {
-		"all": [
-			{ "tech": "phase_town" },
-			{
-				"any": [
-					{ "civ": "athen" },
-					{ "civ": "cart" },
-					{ "civ": "kush" },
-					{ "civ": "mace" },
-					{ "civ": "ptol" },
-					{ "civ": "sele" }
-				]
-			}
-		]
-	},
-	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "upgrade_advanced.png",
-	"researchTime": 40,
-	"tooltip": "Mercenaries are promoted to Advanced rank.",
+	"tooltip": "Mercenaries start at Advanced rank.",
 	"modifications": [
-		{ "value": "Promotion/RequiredXp", "replace": 0, "affects": "Basic" }
+		{ "value": "Promotion/RequiredXp", "replace": 0 }
 	],
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml",
-	"affects": ["Mercenary"]
+	"affects": ["Mercenary Basic"]
 }
Index: ps/trunk/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/mixins/mercenary.xml
@@ -3,7 +3,7 @@
   <Cost>
     <BuildTime op="mul">0.7</BuildTime>
     <Resources>
-      <food op="mul_round">0.4</food>
+      <food>0</food>
       <wood>0</wood>
       <stone>0</stone>
       <!-- Metal is specified on a per-class basis in derived templates. -->
@@ -13,7 +13,7 @@
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
   </Identity>
   <Loot>
-    <food op="mul_round">0.4</food>
+    <food>0</food>
     <wood>0</wood>
     <stone>0</stone>
   </Loot>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/athen/barracks.xml
@@ -14,11 +14,6 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      upgrade_rank_advanced_mercenary
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/athenians/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/barracks.xml
@@ -14,11 +14,6 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Technologies datatype="tokens">
-      upgrade_rank_advanced_mercenary
-    </Technologies>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/macedonians/barracks.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
@@ -40,7 +40,6 @@
       -phase_town_{civ}
       -phase_city_{civ}
       -hellenistic_metropolis
-      upgrade_rank_advanced_mercenary
     </Technologies>
   </ProductionQueue>
   <Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml
@@ -29,9 +29,6 @@
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Technologies datatype="tokens">
-      upgrade_rank_advanced_mercenary
-    </Technologies>
   </ProductionQueue>
   <Resistance>
     <Entity>