Index: template_unit_champion.xml
===================================================================
--- template_unit_champion.xml
+++ template_unit_champion.xml
@@ -14,6 +14,9 @@
     <GenericName>Champion Unit</GenericName>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
+  <Loot>
+    <xp>150</xp>
+  </Loot>
   <Selectable>
     <Overlay>
       <Texture>
@@ -22,13 +25,6 @@
       </Texture>
     </Overlay>
   </Selectable>
-  <Loot>
-    <xp>150</xp>
-    <food>10</food>
-    <wood>10</wood>
-    <stone>0</stone>
-    <metal>20</metal>
-  </Loot>
   <Sound>
     <SoundGroups>
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
Index: template_unit_champion_cavalry.xml
===================================================================
--- template_unit_champion_cavalry.xml
+++ template_unit_champion_cavalry.xml
@@ -7,11 +7,10 @@
   </Armour>
   <Cost>
     <Population>1</Population>
-    <BuildTime>30</BuildTime>
+    <BuildTime>27</BuildTime>
     <Resources>
-      <food>250</food>
-      <wood>0</wood>
-      <stone>0</stone>
+      <food>150</food>
+      <wood>80</wood>
       <metal>100</metal>
     </Resources>
   </Cost>
@@ -29,6 +28,12 @@
       special/formations/wedge
     </Formations>
   </Identity>
+  <Loot>
+    <xp>190</xp>
+    <food>15</food>
+    <wood>8</wood>
+    <metal>10</metal>
+  </Loot>
   <Sound>
     <SoundGroups>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
Index: template_unit_champion_cavalry_archer.xml
===================================================================
--- template_unit_champion_cavalry_archer.xml
+++ template_unit_champion_cavalry_archer.xml
@@ -22,11 +22,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Archer</VisibleClasses>
     <GenericName>Champion Cavalry Archer</GenericName>
Index: template_unit_champion_cavalry_axeman.xml
===================================================================
--- template_unit_champion_cavalry_axeman.xml
+++ template_unit_champion_cavalry_axeman.xml
@@ -18,8 +18,8 @@
   </Attack>
   <Cost>
     <Resources>
-      <wood>100</wood>
-      <metal>100</metal>
+      <wood>90</wood>
+      <metal>90</metal>
     </Resources>
   </Cost>
   <Health>
@@ -29,6 +29,10 @@
     <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
     <GenericName>Champion Cavalry Axeman</GenericName>
   </Identity>
+  <Loot>
+    <wood>9</wood>
+    <metal>9</metal>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">1.2</WalkSpeed>
   </UnitMotion>
Index: template_unit_champion_cavalry_javelinist.xml
===================================================================
--- template_unit_champion_cavalry_javelinist.xml
+++ template_unit_champion_cavalry_javelinist.xml
@@ -22,11 +22,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Ranged Javelinist</VisibleClasses>
     <GenericName>Champion Cavalry Skirmisher</GenericName>
Index: template_unit_champion_cavalry_spearman.xml
===================================================================
--- template_unit_champion_cavalry_spearman.xml
+++ template_unit_champion_cavalry_spearman.xml
@@ -23,11 +23,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Health>
     <Max>300</Max>
   </Health>
Index: template_unit_champion_cavalry_swordsman.xml
===================================================================
--- template_unit_champion_cavalry_swordsman.xml
+++ template_unit_champion_cavalry_swordsman.xml
@@ -19,8 +19,8 @@
   </Attack>
   <Cost>
     <Resources>
-      <wood>75</wood>
-      <metal>125</metal>
+      <wood>60</wood>
+      <metal>120</metal>
     </Resources>
   </Cost>
   <Health>
@@ -30,6 +30,10 @@
     <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Champion Cavalry Swordsman</GenericName>
   </Identity>
+  <Loot>
+    <wood>6</wood>
+    <metal>12</metal>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">1.2</WalkSpeed>
   </UnitMotion>
Index: template_unit_champion_infantry.xml
===================================================================
--- template_unit_champion_infantry.xml
+++ template_unit_champion_infantry.xml
@@ -6,12 +6,11 @@
     <Crush>20</Crush>
   </Armour>
   <Cost>
-    <BuildTime>20</BuildTime>
+    <BuildTime>18</BuildTime>
     <Resources>
-      <food>125</food>
-      <wood>0</wood>
-      <stone>0</stone>
-      <metal>75</metal>
+      <food>70</food>
+      <wood>70</wood>
+      <metal>80</metal>
     </Resources>
   </Cost>
   <Health>
@@ -21,6 +20,11 @@
     <VisibleClasses datatype="tokens">Infantry</VisibleClasses>
     <GenericName>Champion Infantry</GenericName>
   </Identity>
+  <Loot>
+    <food>7</food>
+    <wood>7</wood>
+    <metal>8</metal>
+  </Loot>
   <Position>
     <Anchor>upright</Anchor>
   </Position>
Index: template_unit_champion_infantry_archer.xml
===================================================================
--- template_unit_champion_infantry_archer.xml
+++ template_unit_champion_infantry_archer.xml
@@ -22,11 +22,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Health>
     <Max>120</Max>
   </Health>
Index: template_unit_champion_infantry_axeman.xml
===================================================================
--- template_unit_champion_infantry_axeman.xml
+++ template_unit_champion_infantry_axeman.xml
@@ -19,8 +19,8 @@
   </Attack>
   <Cost>
     <Resources>
-      <wood>100</wood>
-      <metal>75</metal>
+      <wood>90</wood>
+      <metal>60</metal>
     </Resources>
   </Cost>
   <Health>
@@ -30,6 +30,10 @@
     <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
     <GenericName>Champion Axeman</GenericName>
   </Identity>
+  <Loot>
+    <wood>6</wood> 
+    <metal>9</metal>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">1.4</WalkSpeed>
   </UnitMotion>
Index: template_unit_champion_infantry_javelinist.xml
===================================================================
--- template_unit_champion_infantry_javelinist.xml
+++ template_unit_champion_infantry_javelinist.xml
@@ -22,11 +22,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Ranged>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Health>
     <Max>120</Max>
   </Health>
Index: template_unit_champion_infantry_maceman.xml
===================================================================
--- template_unit_champion_infantry_maceman.xml
+++ template_unit_champion_infantry_maceman.xml
@@ -19,8 +19,8 @@
   </Attack>
   <Cost>
     <Resources>
-      <wood>75</wood>
-      <metal>100</metal>
+      <wood>60</wood>
+      <metal>90</metal>
     </Resources>
   </Cost>
   <Health>
@@ -33,6 +33,10 @@
       special/formations/testudo
     </Formations>
   </Identity>
+  <Loot>
+    <wood>6</wood>
+    <metal>9</metal>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">1.4</WalkSpeed>
   </UnitMotion>
Index: template_unit_champion_infantry_pikeman.xml
===================================================================
--- template_unit_champion_infantry_pikeman.xml
+++ template_unit_champion_infantry_pikeman.xml
@@ -24,11 +24,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Health>
     <Max>200</Max>
   </Health>
Index: template_unit_champion_infantry_spearman.xml
===================================================================
--- template_unit_champion_infantry_spearman.xml
+++ template_unit_champion_infantry_spearman.xml
@@ -23,11 +23,6 @@
       <PreferredClasses datatype="tokens">Human</PreferredClasses>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <wood>100</wood>
-    </Resources>
-  </Cost>
   <Health>
     <Max>200</Max>
   </Health>
Index: template_unit_champion_infantry_swordsman.xml
===================================================================
--- template_unit_champion_infantry_swordsman.xml
+++ template_unit_champion_infantry_swordsman.xml
@@ -19,8 +19,8 @@
   </Attack>
   <Cost>
     <Resources>
-      <wood>75</wood>
-      <metal>100</metal>
+      <wood>60</wood>
+      <metal>90</metal>
     </Resources>
   </Cost>
   <Health>
@@ -33,6 +33,10 @@
       special/formations/testudo
     </Formations>
   </Identity>
+  <Loot>
+    <wood>6</wood> 
+    <metal>9</metal>
+  </Loot>
   <UnitMotion>
     <WalkSpeed op="mul">1.4</WalkSpeed>
   </UnitMotion>
Index: units/gaul_champion_fanatic.xml
===================================================================
--- units/gaul_champion_fanatic.xml
+++ units/gaul_champion_fanatic.xml
@@ -4,13 +4,6 @@
     <Hack op="add">-4</Hack>
     <Pierce op="add">-4</Pierce>
   </Armour>
-  <Cost>
-    <BuildTime op="mul">0.75</BuildTime>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Naked Fanatic</GenericName>
Index: units/merc_black_cloak.xml
===================================================================
--- units/merc_black_cloak.xml
+++ units/merc_black_cloak.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
-  <Cost>
-    <BuildTime op="mul">0.75</BuildTime>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">1.5</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
Index: units/merc_thorakites.xml
===================================================================
--- units/merc_thorakites.xml
+++ units/merc_thorakites.xml
@@ -11,12 +11,6 @@
       </Damage>
     </Melee>
   </Attack>
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">1.5</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
Index: units/merc_thureophoros.xml
===================================================================
--- units/merc_thureophoros.xml
+++ units/merc_thureophoros.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_javelinist">
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
Index: units/pers_kardakes_hoplite.xml
===================================================================
--- units/pers_kardakes_hoplite.xml
+++ units/pers_kardakes_hoplite.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_spearman_hoplite">
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <Civ>pers</Civ>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
Index: units/pers_kardakes_skirmisher.xml
===================================================================
--- units/pers_kardakes_skirmisher.xml
+++ units/pers_kardakes_skirmisher.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_javelinist">
-  <Cost>
-    <Resources>
-      <food>0</food>
-      <metal op="mul">2</metal>
-    </Resources>
-  </Cost>
   <Identity>
     <Civ>pers</Civ>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>