Index: ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal.js
+++ ps/trunk/binaries/data/mods/public/maps/random/jebel_barkal.js
@@ -86,7 +86,7 @@
 const oPalisadeTower = "structures/palisades_tower";
 const oKushCitizenArcher = "units/kush/infantry_archer_b";
 const oKushHealer = "units/kush/support_healer_b";
-const oKushChampionArcher = "units/kush/champion_infantry";
+const oKushChampionArcher = "units/kush/champion_infantry_archer";
 const oKushChampions = [
 	oKushChampionArcher,
 	"units/kush/champion_infantry_amun",
Index: ps/trunk/binaries/data/mods/public/maps/random/wild_lake.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/random/wild_lake.js
+++ ps/trunk/binaries/data/mods/public/maps/random/wild_lake.js
@@ -147,7 +147,7 @@
 		{ "Template" : "units/mace/infantry_javelineer_b", "Count" : 4 },
 		{ "Template" : "units/mace/cavalry_spearman_e", "Count" : 3 },
 		{ "Template" : "units/mace/infantry_archer_a", "Count" : 4 },
-		{ "Template" : "units/mace/champion_infantry_a", "Count" : 3 }
+		{ "Template" : "units/mace/champion_infantry_spearman", "Count" : 3 }
 	],
 	"generic/snowy": [
 		{ "Template" : "structures/ptol/mercenary_camp" },
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/combat_demo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/combat_demo.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/combat_demo.xml
@@ -335,31 +335,31 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="100">
-			<Template>units/mace/champion_infantry_e</Template>
+			<Template>units/mace/champion_infantry_spearman_02</Template>
 			<Player>2</Player>
 			<Position x="168.93398" z="103.77627"/>
 			<Orientation y="-2.2371"/>
 		</Entity>
 		<Entity uid="101">
-			<Template>units/mace/champion_infantry_e</Template>
+			<Template>units/mace/champion_infantry_spearman_02</Template>
 			<Player>2</Player>
 			<Position x="165.84691" z="98.34908"/>
 			<Orientation y="-2.04358"/>
 		</Entity>
 		<Entity uid="102">
-			<Template>units/mace/champion_infantry_e</Template>
+			<Template>units/mace/champion_infantry_spearman_02</Template>
 			<Player>2</Player>
 			<Position x="168.86768" z="98.66317"/>
 			<Orientation y="-2.3224"/>
 		</Entity>
 		<Entity uid="103">
-			<Template>units/mace/champion_infantry_e</Template>
+			<Template>units/mace/champion_infantry_spearman_02</Template>
 			<Player>2</Player>
 			<Position x="163.70981" z="101.77434"/>
 			<Orientation y="-2.35347"/>
 		</Entity>
 		<Entity uid="104">
-			<Template>units/mace/champion_infantry_e</Template>
+			<Template>units/mace/champion_infantry_spearman_02</Template>
 			<Player>2</Player>
 			<Position x="166.12447" z="103.64206"/>
 			<Orientation y="-2.23449"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/death_canyon_invasion_force.xml
@@ -17216,121 +17216,121 @@
 			<Orientation y="-1.9601"/>
 		</Entity>
 		<Entity uid="3731">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="443.43763" z="121.54992"/>
 			<Orientation y="-2.22004"/>
 		</Entity>
 		<Entity uid="3732">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="445.2574" z="119.08573"/>
 			<Orientation y="-2.19765"/>
 		</Entity>
 		<Entity uid="3733">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="446.83417" z="116.65687"/>
 			<Orientation y="-2.33127"/>
 		</Entity>
 		<Entity uid="3734">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="448.60184" z="114.87836"/>
 			<Orientation y="-2.03138"/>
 		</Entity>
 		<Entity uid="3735">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="450.2725" z="112.88729"/>
 			<Orientation y="-2.0925"/>
 		</Entity>
 		<Entity uid="3736">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="451.5727" z="111.36794"/>
 			<Orientation y="-2.21531"/>
 		</Entity>
 		<Entity uid="3737">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="453.07541" z="109.37777"/>
 			<Orientation y="-1.9436"/>
 		</Entity>
 		<Entity uid="3738">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="455.00849" z="108.16717"/>
 			<Orientation y="-2.11965"/>
 		</Entity>
 		<Entity uid="3739">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="456.61118" z="107.57731"/>
 			<Orientation y="-2.1597"/>
 		</Entity>
 		<Entity uid="3740">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="457.7905" z="105.47152"/>
 			<Orientation y="-1.92734"/>
 		</Entity>
 		<Entity uid="3741">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="441.55253" z="120.2406"/>
 			<Orientation y="-2.26381"/>
 		</Entity>
 		<Entity uid="3742">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="443.07621" z="117.19588"/>
 			<Orientation y="-2.15285"/>
 		</Entity>
 		<Entity uid="3743">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="444.34018" z="115.39295"/>
 			<Orientation y="-2.0824"/>
 		</Entity>
 		<Entity uid="3744">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="446.33295" z="113.77022"/>
 			<Orientation y="-2.3193"/>
 		</Entity>
 		<Entity uid="3745">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="447.65311" z="111.7419"/>
 			<Orientation y="-2.42305"/>
 		</Entity>
 		<Entity uid="3746">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="448.96164" z="109.73147"/>
 			<Orientation y="-1.95867"/>
 		</Entity>
 		<Entity uid="3747">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="450.05646" z="108.42307"/>
 			<Orientation y="-2.39057"/>
 		</Entity>
 		<Entity uid="3748">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="451.3505" z="107.16208"/>
 			<Orientation y="-2.1925"/>
 		</Entity>
 		<Entity uid="3749">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="452.70743" z="105.8664"/>
 			<Orientation y="-2.38154"/>
 		</Entity>
 		<Entity uid="3750">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>4</Player>
 			<Position x="453.97529" z="104.31428"/>
 			<Orientation y="-2.03617"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/laconia.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/laconia.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/laconia.xml
@@ -6227,49 +6227,49 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1072">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="604.64631" z="624.01783"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1073">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="602.34595" z="626.71387"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1074">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="600.81373" z="624.37781"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1075">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="602.87873" z="621.75831"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1076">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="601.82569" z="620.10163"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1077">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="598.26142" z="623.02955"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1078">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="597.42042" z="621.31458"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1079">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="599.22388" z="619.07258"/>
 			<Orientation y="2.35621"/>
@@ -6545,37 +6545,37 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1125">
-			<Template>units/spart/champion_infantry_sword</Template>
+			<Template>units/spart/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="641.09504" z="636.53144"/>
 			<Orientation y="0.59348"/>
 		</Entity>
 		<Entity uid="1126">
-			<Template>units/spart/champion_infantry_sword</Template>
+			<Template>units/spart/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="643.78168" z="635.32331"/>
 			<Orientation y="0.95231"/>
 		</Entity>
 		<Entity uid="1127">
-			<Template>units/spart/champion_infantry_sword</Template>
+			<Template>units/spart/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="645.3" z="632.62446"/>
 			<Orientation y="1.07848"/>
 		</Entity>
 		<Entity uid="1128">
-			<Template>units/spart/champion_infantry_sword</Template>
+			<Template>units/spart/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="644.65857" z="620.51587"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1129">
-			<Template>units/spart/champion_infantry_sword</Template>
+			<Template>units/spart/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="641.82978" z="616.97651"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="1130">
-			<Template>units/spart/champion_infantry_sword</Template>
+			<Template>units/spart/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="636.82966" z="612.48719"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/road_demo.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/road_demo.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/road_demo.xml
@@ -557,7 +557,7 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="136">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="305.20514" z="373.64271"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_britons.xml
@@ -21928,77 +21928,77 @@
 			<Actor seed="20916"/>
 		</Entity>
 		<Entity uid="3858">
-			<Template>units/brit/champion_infantry</Template>
+			<Template>units/brit/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="533.13166" z="500.30692"/>
 			<Orientation y="-3.13271"/>
 			<Actor seed="13060"/>
 		</Entity>
 		<Entity uid="3859">
-			<Template>units/brit/champion_infantry</Template>
+			<Template>units/brit/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="530.38746" z="498.8347"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="63370"/>
 		</Entity>
 		<Entity uid="3860">
-			<Template>units/brit/champion_infantry</Template>
+			<Template>units/brit/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="531.74347" z="494.44672"/>
 			<Orientation y="1.09035"/>
 			<Actor seed="52072"/>
 		</Entity>
 		<Entity uid="3861">
-			<Template>units/brit/champion_infantry</Template>
+			<Template>units/brit/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="535.5301" z="492.17551"/>
 			<Orientation y="-0.53303"/>
 			<Actor seed="10464"/>
 		</Entity>
 		<Entity uid="3862">
-			<Template>units/brit/champion_infantry</Template>
+			<Template>units/brit/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="536.40766" z="495.13923"/>
 			<Orientation y="-1.51746"/>
 			<Actor seed="19750"/>
 		</Entity>
 		<Entity uid="3863">
-			<Template>units/brit/champion_infantry</Template>
+			<Template>units/brit/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="535.82081" z="498.8347"/>
 			<Orientation y="-2.09527"/>
 			<Actor seed="21162"/>
 		</Entity>
 		<Entity uid="3864">
-			<Template>units/brit/champion_infantry</Template>
+			<Template>units/brit/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="532.72254" z="497.25062"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61952"/>
 		</Entity>
 		<Entity uid="3865">
-			<Template>units/brit/champion_infantry</Template>
+			<Template>units/brit/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="533.83991" z="494.53217"/>
 			<Orientation y="0.43418"/>
 			<Actor seed="28594"/>
 		</Entity>
 		<Entity uid="3866">
-			<Template>units/brit/champion_infantry</Template>
+			<Template>units/brit/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="529.22773" z="496.30979"/>
 			<Orientation y="2.98131"/>
 			<Actor seed="8540"/>
 		</Entity>
 		<Entity uid="3867">
-			<Template>units/brit/champion_infantry</Template>
+			<Template>units/brit/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="531.05121" z="500.85361"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21126"/>
 		</Entity>
 		<Entity uid="3868">
-			<Template>units/brit/champion_infantry</Template>
+			<Template>units/brit/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="537.6316" z="496.30979"/>
 			<Orientation y="-2.08127"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_carthaginians.xml
@@ -1324,49 +1324,49 @@
 			<Orientation y="0.79787"/>
 		</Entity>
 		<Entity uid="264">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>2</Player>
 			<Position x="585.09205" z="294.44172"/>
 			<Orientation y="-2.5559"/>
 		</Entity>
 		<Entity uid="265">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>2</Player>
 			<Position x="580.51606" z="294.71726"/>
 			<Orientation y="-2.50855"/>
 		</Entity>
 		<Entity uid="266">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>2</Player>
 			<Position x="576.73066" z="296.58393"/>
 			<Orientation y="-2.55755"/>
 		</Entity>
 		<Entity uid="267">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>2</Player>
 			<Position x="574.72999" z="303.13392"/>
 			<Orientation y="-2.72352"/>
 		</Entity>
 		<Entity uid="268">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>2</Player>
 			<Position x="577.15271" z="303.76105"/>
 			<Orientation y="-2.8909"/>
 		</Entity>
 		<Entity uid="269">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>2</Player>
 			<Position x="579.17469" z="300.88099"/>
 			<Orientation y="-2.76958"/>
 		</Entity>
 		<Entity uid="270">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>2</Player>
 			<Position x="581.11658" z="298.21232"/>
 			<Orientation y="-2.89113"/>
 		</Entity>
 		<Entity uid="271">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>2</Player>
 			<Position x="583.425" z="298.69874"/>
 			<Orientation y="-2.87711"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_gauls.xml
@@ -21961,77 +21961,77 @@
 			<Actor seed="20916"/>
 		</Entity>
 		<Entity uid="3858">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="547.30604" z="459.64957"/>
 			<Orientation y="-3.13271"/>
 			<Actor seed="13060"/>
 		</Entity>
 		<Entity uid="3859">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="544.56183" z="458.17734"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="63370"/>
 		</Entity>
 		<Entity uid="3860">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="545.91785" z="453.78937"/>
 			<Orientation y="1.09035"/>
 			<Actor seed="52072"/>
 		</Entity>
 		<Entity uid="3861">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="549.70447" z="451.51816"/>
 			<Orientation y="-0.53303"/>
 			<Actor seed="10464"/>
 		</Entity>
 		<Entity uid="3862">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="550.58204" z="454.48188"/>
 			<Orientation y="-1.51746"/>
 			<Actor seed="19750"/>
 		</Entity>
 		<Entity uid="3863">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="549.99518" z="458.17734"/>
 			<Orientation y="-2.09527"/>
 			<Actor seed="21162"/>
 		</Entity>
 		<Entity uid="3864">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="546.89692" z="456.59327"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61952"/>
 		</Entity>
 		<Entity uid="3865">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="548.01429" z="453.87482"/>
 			<Orientation y="0.43418"/>
 			<Actor seed="28594"/>
 		</Entity>
 		<Entity uid="3866">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="543.4021" z="455.65244"/>
 			<Orientation y="2.98131"/>
 			<Actor seed="8540"/>
 		</Entity>
 		<Entity uid="3867">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="545.2256" z="460.19626"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21126"/>
 		</Entity>
 		<Entity uid="3868">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="551.80597" z="455.65244"/>
 			<Orientation y="-2.08127"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_iberians.xml
@@ -577,37 +577,37 @@
 			<Orientation y="-2.29711"/>
 		</Entity>
 		<Entity uid="93">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="394.85737" z="217.73746"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="94">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="391.71393" z="215.42203"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="95">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="388.45798" z="212.30677"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="96">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="383.38788" z="216.03916"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="97">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="387.70328" z="218.49207"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="98">
-			<Template>units/iber/champion_infantry</Template>
+			<Template>units/iber/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="391.31684" z="221.64954"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_kushites.xml
@@ -12769,21 +12769,21 @@
 			<Actor seed="47118"/>
 		</Entity>
 		<Entity uid="2458">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>1</Player>
 			<Position x="373.88907" z="400.40192"/>
 			<Orientation y="-2.86306"/>
 			<Actor seed="53872"/>
 		</Entity>
 		<Entity uid="2459">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>1</Player>
 			<Position x="375.97223" z="400.66855"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="65136"/>
 		</Entity>
 		<Entity uid="2460">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>1</Player>
 			<Position x="377.7963" z="403.54255"/>
 			<Orientation y="-0.7307"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_macedonians.xml
@@ -4521,70 +4521,70 @@
 			<Actor seed="11004"/>
 		</Entity>
 		<Entity uid="896">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="610.4051" z="1386.9823"/>
 			<Orientation y="2.52132"/>
 			<Actor seed="25944"/>
 		</Entity>
 		<Entity uid="897">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="612.17884" z="1389.22999"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="25362"/>
 		</Entity>
 		<Entity uid="898">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="614.02912" z="1390.95752"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="53226"/>
 		</Entity>
 		<Entity uid="899">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="615.20142" z="1392.47754"/>
 			<Orientation y="2.54194"/>
 			<Actor seed="55860"/>
 		</Entity>
 		<Entity uid="900">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="617.15345" z="1395.04041"/>
 			<Orientation y="2.62427"/>
 			<Actor seed="49206"/>
 		</Entity>
 		<Entity uid="901">
-			<Template>units/mace/champion_infantry_e</Template>
+			<Template>units/mace/champion_infantry_spearman_02</Template>
 			<Player>1</Player>
 			<Position x="613.85938" z="1385.03724"/>
 			<Orientation y="2.53823"/>
 			<Actor seed="7734"/>
 		</Entity>
 		<Entity uid="902">
-			<Template>units/mace/champion_infantry_e</Template>
+			<Template>units/mace/champion_infantry_spearman_02</Template>
 			<Player>1</Player>
 			<Position x="615.86731" z="1387.2732"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="51022"/>
 		</Entity>
 		<Entity uid="903">
-			<Template>units/mace/champion_infantry_e</Template>
+			<Template>units/mace/champion_infantry_spearman_02</Template>
 			<Player>1</Player>
 			<Position x="617.26905" z="1388.77613"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27506"/>
 		</Entity>
 		<Entity uid="904">
-			<Template>units/mace/champion_infantry_e</Template>
+			<Template>units/mace/champion_infantry_spearman_02</Template>
 			<Player>1</Player>
 			<Position x="618.64698" z="1390.09314"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="20644"/>
 		</Entity>
 		<Entity uid="905">
-			<Template>units/mace/champion_infantry_e</Template>
+			<Template>units/mace/champion_infantry_spearman_02</Template>
 			<Player>1</Player>
 			<Position x="620.61792" z="1391.82203"/>
 			<Orientation y="2.35621"/>
@@ -9879,336 +9879,336 @@
 			<Actor seed="60330"/>
 		</Entity>
 		<Entity uid="1740">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="222.74456" z="1246.43213"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="61834"/>
 		</Entity>
 		<Entity uid="1741">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="225.29415" z="1246.65931"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="25300"/>
 		</Entity>
 		<Entity uid="1742">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="226.83657" z="1248.07496"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="18592"/>
 		</Entity>
 		<Entity uid="1743">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="229.00657" z="1249.85877"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="55570"/>
 		</Entity>
 		<Entity uid="1744">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="230.83478" z="1250.70228"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="5534"/>
 		</Entity>
 		<Entity uid="1745">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="232.32117" z="1252.74244"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="64570"/>
 		</Entity>
 		<Entity uid="1746">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="234.24674" z="1253.86902"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49670"/>
 		</Entity>
 		<Entity uid="1747">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="236.89533" z="1256.10633"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="39074"/>
 		</Entity>
 		<Entity uid="1748">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="238.84076" z="1258.12122"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24110"/>
 		</Entity>
 		<Entity uid="1749">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="240.7179" z="1259.42371"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="27984"/>
 		</Entity>
 		<Entity uid="1750">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="243.43827" z="1260.52833"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="60658"/>
 		</Entity>
 		<Entity uid="1751">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="244.8503" z="1262.70411"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="33234"/>
 		</Entity>
 		<Entity uid="1752">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="246.87087" z="1258.77906"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="46918"/>
 		</Entity>
 		<Entity uid="1753">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="242.96912" z="1256.22803"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="11406"/>
 		</Entity>
 		<Entity uid="1754">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="241.5983" z="1254.2837"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13858"/>
 		</Entity>
 		<Entity uid="1755">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="240.0435" z="1253.20545"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="24068"/>
 		</Entity>
 		<Entity uid="1756">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="236.4801" z="1248.9845"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="5602"/>
 		</Entity>
 		<Entity uid="1757">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="235.87081" z="1248.34583"/>
 			<Orientation y="-2.37282"/>
 			<Actor seed="59298"/>
 		</Entity>
 		<Entity uid="1758">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="233.67136" z="1246.48206"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="28328"/>
 		</Entity>
 		<Entity uid="1759">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="232.11623" z="1245.88062"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="43944"/>
 		</Entity>
 		<Entity uid="1760">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="229.43802" z="1244.15357"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="43474"/>
 		</Entity>
 		<Entity uid="1761">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="225.76883" z="1241.90381"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="36288"/>
 		</Entity>
 		<Entity uid="1762">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="224.98072" z="1240.3324"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="52492"/>
 		</Entity>
 		<Entity uid="1763">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="221.4157" z="1237.7306"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="15044"/>
 		</Entity>
 		<Entity uid="1764">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="226.27125" z="1236.63819"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="10272"/>
 		</Entity>
 		<Entity uid="1765">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="229.45838" z="1238.29102"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="4196"/>
 		</Entity>
 		<Entity uid="1766">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="230.58155" z="1239.43738"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="51958"/>
 		</Entity>
 		<Entity uid="1767">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="232.2655" z="1240.7063"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13312"/>
 		</Entity>
 		<Entity uid="1768">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="234.14383" z="1242.20667"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54780"/>
 		</Entity>
 		<Entity uid="1769">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="236.90461" z="1243.51429"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="58014"/>
 		</Entity>
 		<Entity uid="1770">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="239.04194" z="1246.33558"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="51034"/>
 		</Entity>
 		<Entity uid="1771">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="240.87121" z="1248.39002"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="53798"/>
 		</Entity>
 		<Entity uid="1772">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="242.94327" z="1250.60108"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="31780"/>
 		</Entity>
 		<Entity uid="1773">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="243.96061" z="1251.58423"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="48856"/>
 		</Entity>
 		<Entity uid="1774">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="244.95128" z="1253.4015"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="54550"/>
 		</Entity>
 		<Entity uid="1775">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="246.61973" z="1255.94324"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="38450"/>
 		</Entity>
 		<Entity uid="1776">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="249.96927" z="1254.61756"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="60104"/>
 		</Entity>
 		<Entity uid="1777">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="247.04386" z="1250.30176"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="47904"/>
 		</Entity>
 		<Entity uid="1778">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="246.6507" z="1249.68482"/>
 			<Orientation y="-2.4257"/>
 			<Actor seed="40486"/>
 		</Entity>
 		<Entity uid="1779">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="243.04677" z="1246.10071"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="15826"/>
 		</Entity>
 		<Entity uid="1780">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="241.35358" z="1244.16504"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13814"/>
 		</Entity>
 		<Entity uid="1781">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="238.93985" z="1241.61963"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="13290"/>
 		</Entity>
 		<Entity uid="1782">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="236.64005" z="1239.86744"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49988"/>
 		</Entity>
 		<Entity uid="1783">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="234.4494" z="1238.51966"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="17526"/>
 		</Entity>
 		<Entity uid="1784">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="232.77715" z="1237.54761"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="21122"/>
 		</Entity>
 		<Entity uid="1785">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="232.14618" z="1236.92054"/>
 			<Orientation y="-2.1728"/>
 			<Actor seed="38242"/>
 		</Entity>
 		<Entity uid="1786">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="229.05169" z="1234.61915"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40982"/>
 		</Entity>
 		<Entity uid="1787">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="226.78057" z="1233.36329"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/sandbox_romans.xml
@@ -11175,105 +11175,105 @@
 			<Actor seed="55596"/>
 		</Entity>
 		<Entity uid="2457">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="678.91388" z="279.96866"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="19604"/>
 		</Entity>
 		<Entity uid="2458">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="677.3791" z="277.80384"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="51358"/>
 		</Entity>
 		<Entity uid="2459">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="675.84021" z="276.56293"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49226"/>
 		</Entity>
 		<Entity uid="2460">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="679.41926" z="273.60987"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="19906"/>
 		</Entity>
 		<Entity uid="2461">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="680.52515" z="275.79371"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="41036"/>
 		</Entity>
 		<Entity uid="2462">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="682.13685" z="277.71335"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="11960"/>
 		</Entity>
 		<Entity uid="2463">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="682.82105" z="271.11585"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="3238"/>
 		</Entity>
 		<Entity uid="2464">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="684.27674" z="273.4944"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="1318"/>
 		</Entity>
 		<Entity uid="2465">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="685.57355" z="275.1922"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="23338"/>
 		</Entity>
 		<Entity uid="2466">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="681.32941" z="269.18403"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="14204"/>
 		</Entity>
 		<Entity uid="2467">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="677.41077" z="271.30683"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="45266"/>
 		</Entity>
 		<Entity uid="2468">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="673.52417" z="273.59775"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="40390"/>
 		</Entity>
 		<Entity uid="2469">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="672.55604" z="270.36432"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="49270"/>
 		</Entity>
 		<Entity uid="2470">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="675.55665" z="268.83063"/>
 			<Orientation y="2.35621"/>
 			<Actor seed="16036"/>
 		</Entity>
 		<Entity uid="2471">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="678.40546" z="266.88263"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/the_persian_gates.xml
@@ -114,73 +114,73 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="175">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="368.84815" z="999.83875"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="176">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="369.90635" z="1002.00086"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="177">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="371.50129" z="1003.425"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="178">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="372.3318" z="1005.44239"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="179">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="373.44321" z="1007.19355"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="180">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="374.09223" z="1009.44324"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="181">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="371.30857" z="997.93628"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="182">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="372.43955" z="999.87598"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="183">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="373.30127" z="1001.67078"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="184">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="374.24976" z="1003.85163"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="185">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="375.25187" z="1005.79859"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="186">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>1</Player>
 			<Position x="376.3625" z="1008.18165"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/third_macedonian_war.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/third_macedonian_war.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/third_macedonian_war.xml
@@ -888,121 +888,121 @@
 			<Orientation y="1.54017"/>
 		</Entity>
 		<Entity uid="190">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="239.13569" z="429.45075"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="191">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="240.30942" z="431.59308"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="192">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="242.08483" z="432.95603"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="193">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="243.57212" z="435.55542"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="194">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="244.83097" z="436.5511"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="195">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="246.13878" z="438.26578"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="196">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="247.95464" z="440.16813"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="197">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="249.60674" z="442.0232"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="198">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="250.90391" z="443.90265"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="199">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="237.93676" z="427.94282"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="200">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="240.48899" z="426.03583"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="201">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="241.6846" z="427.78663"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="202">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="242.67103" z="428.90159"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="203">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="244.34163" z="430.99622"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="204">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="246.01688" z="432.8292"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="205">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="247.6679" z="434.72913"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="206">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="249.04462" z="435.97785"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="207">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="250.1075" z="437.65784"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="208">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="251.71326" z="438.96506"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="209">
-			<Template>units/rome/champion_infantry</Template>
+			<Template>units/rome/champion_infantry_swordsman</Template>
 			<Player>1</Player>
 			<Position x="252.63048" z="440.6631"/>
 			<Orientation y="2.35621"/>
@@ -1548,61 +1548,61 @@
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="302">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="760.21357" z="297.43174"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="303">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="761.36615" z="299.04764"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="304">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="762.35084" z="300.6067"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="305">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="763.34473" z="301.92954"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="306">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="764.4546" z="303.59507"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="307">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="766.37623" z="302.52588"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="308">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="764.90668" z="300.05063"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="309">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="763.76435" z="298.88538"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="310">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="762.83454" z="297.52143"/>
 			<Orientation y="2.35621"/>
 		</Entity>
 		<Entity uid="311">
-			<Template>units/mace/champion_infantry_a</Template>
+			<Template>units/mace/champion_infantry_spearman</Template>
 			<Player>2</Player>
 			<Position x="761.80823" z="296.35279"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_mountains_3p.xml
@@ -2952,21 +2952,21 @@
 			<Actor seed="43932"/>
 		</Entity>
 		<Entity uid="3400">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>0</Player>
 			<Position x="776.43134" z="231.45167"/>
 			<Orientation y="-1.44887"/>
 			<Actor seed="41296"/>
 		</Entity>
 		<Entity uid="3401">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>0</Player>
 			<Position x="775.92957" z="226.9015"/>
 			<Orientation y="-1.31069"/>
 			<Actor seed="27960"/>
 		</Entity>
 		<Entity uid="3402">
-			<Template>units/gaul/champion_infantry</Template>
+			<Template>units/gaul/champion_infantry_swordsman</Template>
 			<Player>0</Player>
 			<Position x="777.64295" z="234.8532"/>
 			<Orientation y="-1.20908"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/egypt_3pv3p.xml
@@ -104115,28 +104115,28 @@
 			<Actor seed="20798"/>
 		</Entity>
 		<Entity uid="21784">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>2</Player>
 			<Position x="1513.30323" z="496.16877"/>
 			<Orientation y="-0.5436"/>
 			<Actor seed="36424"/>
 		</Entity>
 		<Entity uid="21785">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>2</Player>
 			<Position x="1514.90857" z="497.25016"/>
 			<Orientation y="-0.634"/>
 			<Actor seed="37102"/>
 		</Entity>
 		<Entity uid="21786">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>2</Player>
 			<Position x="1514.47522" z="494.40168"/>
 			<Orientation y="-0.5474"/>
 			<Actor seed="16464"/>
 		</Entity>
 		<Entity uid="21787">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>2</Player>
 			<Position x="1516.34046" z="495.5716"/>
 			<Orientation y="-0.64074"/>
@@ -109983,42 +109983,42 @@
 			<Actor seed="8094"/>
 		</Entity>
 		<Entity uid="22821">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>2</Player>
 			<Position x="1519.09498" z="492.34775"/>
 			<Orientation y="-0.64075"/>
 			<Actor seed="48924"/>
 		</Entity>
 		<Entity uid="22822">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>2</Player>
 			<Position x="1517.22974" z="491.17783"/>
 			<Orientation y="-0.5474"/>
 			<Actor seed="16464"/>
 		</Entity>
 		<Entity uid="22823">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>2</Player>
 			<Position x="1517.6631" z="494.02631"/>
 			<Orientation y="-0.63401"/>
 			<Actor seed="37102"/>
 		</Entity>
 		<Entity uid="22824">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>2</Player>
 			<Position x="1516.05774" z="492.94492"/>
 			<Orientation y="-0.5436"/>
 			<Actor seed="36424"/>
 		</Entity>
 		<Entity uid="22825">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>2</Player>
 			<Position x="1518.29139" z="489.66334"/>
 			<Orientation y="-0.5474"/>
 			<Actor seed="16464"/>
 		</Entity>
 		<Entity uid="22826">
-			<Template>units/kush/champion_infantry</Template>
+			<Template>units/kush/champion_infantry_archer</Template>
 			<Player>2</Player>
 			<Position x="1520.15662" z="490.83326"/>
 			<Orientation y="-0.64075"/>
Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
+++ ps/trunk/binaries/data/mods/public/maps/skirmishes/forest_battle_4p.xml
@@ -2249,7 +2249,7 @@
 			<Actor seed="64856"/>
 		</Entity>
 		<Entity uid="620">
-			<Template>units/brit/champion_infantry</Template>
+			<Template>units/brit/champion_infantry_swordsman</Template>
 			<Player>0</Player>
 			<Position x="378.47928" z="308.23377"/>
 			<Orientation y="2.35621"/>
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_chariots.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_chariots.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_chariots.json
@@ -11,7 +11,8 @@
 				"any": [
 					{ "civ": "brit" },
 					{ "civ": "maur" },
-					{ "civ": "pers" }
+					{ "civ": "pers" },
+					{ "civ": "sele" }
 				]
 			}
 		]
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_infantry.json
@@ -0,0 +1,27 @@
+{
+	"genericName": "Unlock Champion Infantry",
+	"specificName": {
+		"mace": "Agēma",
+		"ptol": "Agēma",
+		"rome": "Regio Cohors"
+	},
+	"description": "Guard units (Champions) are professionals who wield the best weapons and have the best training.",
+	"cost": {
+		"food": 600
+	},
+	"requirements": {
+		"all": [
+			{ "tech": "phase_city" },
+			{ "notciv": "athen" },
+			{ "notciv": "cart" },
+			{ "notciv": "pers" },
+			{ "notciv": "sele" },
+			{ "notciv": "spart" }
+		]
+	},
+	"requirementsTooltip": "Unlocked in City Phase.",
+	"icon": "helmet_corinthian_crest.png",
+	"researchTime": 60,
+	"tooltip": "Unlock Champions Infantry at the Barracks.",
+	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
+}
Index: ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
+++ ps/trunk/binaries/data/mods/public/simulation/data/technologies/unlock_champion_units.json
@@ -1,32 +0,0 @@
-{
-	"genericName": "Unlock Champion Infantry",
-	"specificName": {
-		"mace": "Agēma",
-		"ptol": "Agēma",
-		"rome": "Regio Cohors",
-		"sele": "Agēma"
-	},
-	"description": "Guard units (Champions) are professionals who wield the best weapons and have the best training.",
-	"cost": {
-		"food": 600
-	},
-	"requirements": {
-		"all": [
-			{ "tech": "phase_city" },
-			{
-				"any": [
-					{ "civ": "brit" },
-					{ "civ": "gaul" },
-					{ "civ": "iber" },
-					{ "civ": "mace" },
-					{ "civ": "rome" }
-				]
-			}
-		]
-	},
-	"requirementsTooltip": "Unlocked in City Phase.",
-	"icon": "helmet_corinthian_crest.png",
-	"researchTime": 60,
-	"tooltip": "Unlock Champions Infantry at the Barracks.",
-	"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
-}
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/brit/fortress.xml
@@ -10,14 +10,13 @@
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Dunon</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="29.0" depth="29.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}/champion_infantry
       units/{civ}/hero_boudicca
       units/{civ}/hero_caratacos
       units/{civ}/hero_cunobelin
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/fortress.xml
@@ -3,13 +3,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Dunon</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/champion_infantry
-    </Entities>
-  </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_fortress.xml</select>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/iber/fortress.xml
@@ -3,14 +3,13 @@
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Castro</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="27.0" depth="27.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}/champion_infantry
       units/{civ}/hero_caros
       units/{civ}/hero_indibil
       units/{civ}/hero_viriato
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/kush/fortress.xml
@@ -7,14 +7,13 @@
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Htm</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="28.0" depth="28.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}/champion_infantry
       units/{civ}/hero_nastasen
       units/{civ}/hero_amanirenas
       units/{civ}/hero_arakamani
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/mace/fortress.xml
@@ -7,15 +7,13 @@
   <Identity>
     <Civ>mace</Civ>
     <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}/champion_infantry_a
-      units/{civ}/champion_infantry_swordsman
       units/{civ}/hero_philip_ii
       units/{civ}/hero_alexander_iii
       units/{civ}/hero_demetrius_i
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/ptol/fortress.xml
@@ -7,16 +7,10 @@
   <Identity>
     <Civ>ptol</Civ>
     <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry Pikemen. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/champion_infantry_pikeman
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/ptolemies/fortress.xml</Actor>
   </VisualActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/rome/fortress.xml
@@ -3,11 +3,10 @@
   <Identity>
     <Civ>rome</Civ>
     <SpecificName>Castellum</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Heroes. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}/champion_infantry
       units/{civ}/hero_marcellus
       units/{civ}/hero_maximus
       units/{civ}/hero_scipio
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/sele/fortress.xml
@@ -7,18 +7,12 @@
   <Identity>
     <Civ>sele</Civ>
     <SpecificName>Phrourion</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Obstruction>
     <Static width="24.0" depth="26.0"/>
   </Obstruction>
   <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/champion_infantry_pikeman
-      units/{civ}/champion_infantry_swordsman
-    </Entities>
     <Technologies datatype="tokens">
-      pair_unlock_champions_sele
       parade_of_daphne
     </Technologies>
   </ProductionQueue>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart/barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart/barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/spart/barracks.xml
@@ -14,11 +14,6 @@
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}/champion_infantry_sword
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/spartans/barracks.xml</Actor>
     <FoundationActor>structures/fndn_7x7.xml</FoundationActor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml
@@ -42,19 +42,26 @@
     <Entities datatype="tokens">
       units/{civ}/infantry_spearman_b
       units/{civ}/infantry_pikeman_b
+      units/{civ}/infantry_maceman_b
       units/{civ}/infantry_axeman_b
       units/{civ}/infantry_swordsman_b
       units/{civ}/infantry_javelineer_b
       units/{civ}/infantry_slinger_b
       units/{civ}/infantry_archer_b
-      units/{civ}/champion_infantry_barracks
-      units/{civ}/champion_infantry_swordsman_barracks
+      units/{civ}/champion_infantry_spearman
+      units/{civ}/champion_infantry_pikeman
       units/{civ}/champion_infantry_maceman
+      units/{civ}/champion_infantry_axeman
+      units/{civ}/champion_infantry_swordsman
+      units/{civ}/champion_infantry_javelineer
+      units/{civ}/champion_infantry_slinger
+      units/{civ}/champion_infantry_archer
     </Entities>
     <Technologies datatype="tokens">
       barracks_batch_training
       infantry_cost_time
-      unlock_champion_units
+      unlock_champion_infantry
+      pair_unlock_champions_sele
     </Technologies>
   </ProductionQueue>
   <Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>brit</Civ>
-    <GenericName>Brythonic Champion</GenericName>
-    <SpecificName>Argos</SpecificName>
-    <SelectionGroupName>units/brit/champion_infantry</SelectionGroupName>
-    <Icon>units/brit_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/britons/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_barracks.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/brit/champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/brit/champion_infantry_swordsman.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Identity>
+    <Civ>brit</Civ>
+    <GenericName>Brythonic Champion</GenericName>
+    <SpecificName>Argos</SpecificName>
+    <Icon>units/brit_champion_infantry.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
+  </Identity>
+  <VisualActor>
+    <Actor>units/britons/infantry_swordsman_c.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Identity>
-    <Civ>gaul</Civ>
-    <GenericName>Gallic Champion</GenericName>
-    <SpecificName>Soliduros</SpecificName>
-    <SelectionGroupName>units/gaul/champion_infantry</SelectionGroupName>
-    <Icon>units/gaul_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/gauls/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_barracks.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/gaul/champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/champion_infantry_swordsman.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Identity>
+    <Civ>gaul</Civ>
+    <SpecificName>Soliduros</SpecificName>
+    <Icon>units/gaul_champion_infantry.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
+  </Identity>
+  <VisualActor>
+    <Actor>units/gauls/infantry_swordsman_c.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry.xml
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Attack>
-    <Melee>
-      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
-    </Melee>
-  </Attack>
-  <Identity>
-    <Civ>iber</Civ>
-    <SpecificName>Leial Ezpatari</SpecificName>
-    <Icon>units/iber_champion_infantry.png</Icon>
-    <SelectionGroupName>units/iber/champion_infantry</SelectionGroupName>
-  </Identity>
-  <VisualActor>
-    <Actor>units/iberians/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_barracks.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/iber/champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/iber/champion_infantry_swordsman.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
+  <Identity>
+    <Civ>iber</Civ>
+    <SpecificName>Leial Ezpatari</SpecificName>
+    <Icon>units/iber_champion_infantry.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
+  </Identity>
+  <VisualActor>
+    <Actor>units/iberians/infantry_swordsman_c.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_archer">
-  <Identity>
-    <Civ>kush</Civ>
-    <Lang>napatan</Lang>
-    <GenericName>Noble Archer</GenericName>
-    <SpecificName>Hry pdty</SpecificName>
-    <Icon>units/kush_champion_archer.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/kushites/infantry_archer_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_archer.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_archer.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/kush/champion_infantry_archer.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_archer">
+  <Identity>
+    <Civ>kush</Civ>
+    <Lang>napatan</Lang>
+    <GenericName>Noble Archer</GenericName>
+    <SpecificName>Hry pdty</SpecificName>
+    <Icon>units/kush_champion_archer.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
+  </Identity>
+  <VisualActor>
+    <Actor>units/kushites/infantry_archer_c.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_a.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_a.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_a.xml
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_spearman_hoplite">
-  <Identity>
-    <Civ>mace</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Macedonian Shield Bearer</GenericName>
-    <SpecificName>Hypaspistḗs</SpecificName>
-    <Icon>units/mace_hypaspist.png</Icon>
-    <SelectionGroupName>units/mace/champion_infantry_a</SelectionGroupName>
-  </Identity>
-  <Promotion>
-    <Entity>units/mace/champion_infantry_e</Entity>
-    <RequiredXp>2000</RequiredXp>
-  </Promotion>
-  <VisualActor>
-    <Actor>units/macedonians/infantry_spearman_c_a.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_barracks.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace/champion_infantry_a">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_e.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_e.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_e.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace/champion_infantry_a">
-  <Attack>
-    <Melee>
-      <Damage>
-        <Hack op="mul">1.1</Hack>
-        <Pierce op="mul">1.1</Pierce>
-      </Damage>
-    </Melee>
-  </Attack>
-  <Health>
-    <Max op="mul">1.1</Max>
-  </Health>
-  <Identity>
-    <SpecificName>Hypaspistḗs Argyraspídi</SpecificName>
-    <Icon>units/mace_argyraspidai.png</Icon>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/macedonians/infantry_spearman_c_e.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_spearman_hoplite">
+  <Identity>
+    <Civ>mace</Civ>
+    <Lang>greek</Lang>
+    <GenericName>Macedonian Shield Bearer</GenericName>
+    <SpecificName>Hypaspistḗs</SpecificName>
+    <SelectionGroupName>units/mace/champion_infantry_spearman</SelectionGroupName>
+    <Icon>units/mace_hypaspist.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
+  </Identity>
+  <Promotion>
+    <Entity>units/mace/champion_infantry_spearman_02</Entity>
+    <RequiredXp>2000</RequiredXp>
+  </Promotion>
+  <VisualActor>
+    <Actor>units/macedonians/infantry_spearman_c_a.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman_02.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman_02.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_spearman_02.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="units/mace/champion_infantry_spearman">
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack op="mul">1.1</Hack>
+        <Pierce op="mul">1.1</Pierce>
+      </Damage>
+    </Melee>
+  </Attack>
+  <Health>
+    <Max op="mul">1.1</Max>
+  </Health>
+  <Identity>
+    <SpecificName>Hypaspistḗs Argyraspídi</SpecificName>
+    <Icon>units/mace_argyraspidai.png</Icon>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/macedonians/infantry_spearman_c_e.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman.xml
@@ -10,8 +10,8 @@
     <Lang>greek</Lang>
     <GenericName>Thracian Black Cloak</GenericName>
     <SpecificName>Rhomphaiaphoros</SpecificName>
-    <SelectionGroupName>units/mace/champion_infantry_swordsman</SelectionGroupName>
     <Icon>units/sele_infantry_swordsman.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/hellenes/infantry_swordsman_c_thracian_blackcloak.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/mace/champion_infantry_swordsman_barracks.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/mace/champion_infantry_swordsman">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/champion_infantry_maceman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/champion_infantry_maceman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/maur/champion_infantry_maceman.xml
@@ -6,6 +6,7 @@
     <SpecificName>Yōddha</SpecificName>
     <SelectionGroupName>units/maur/champion_infantry</SelectionGroupName>
     <Icon>units/maur_champion_maceman.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/mauryas/infantry_maceman_c.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/ptol/champion_infantry_pikeman.xml
@@ -6,6 +6,7 @@
     <GenericName>Royal Guard Infantry</GenericName>
     <SpecificName>Phalangitès Agema</SpecificName>
     <Icon>units/ptol_champion_infantry.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/ptolemies/infantry_pikeman_c.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry.xml
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_infantry_swordsman">
-  <Health>
-    <DamageVariants>
-      <lightdamage>0.85</lightdamage>
-      <mediumdamage>0.45</mediumdamage>
-    </DamageVariants>
-  </Health>
-  <Identity>
-    <Civ>rome</Civ>
-    <Lang>latin</Lang>
-    <GenericName>Italic Heavy Infantry</GenericName>
-    <SpecificName>Extrāōrdinārius</SpecificName>
-    <SelectionGroupName>units/rome/champion_infantry</SelectionGroupName>
-    <Icon>units/rome_champion_infantry.png</Icon>
-  </Identity>
-  <VisualActor>
-    <Actor>units/romans/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_barracks.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_barracks.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_barracks.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome/champion_infantry">
-  <Identity>
-    <RequiredTechnology>unlock_champion_units</RequiredTechnology>
-  </Identity>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_champion_infantry_swordsman">
+  <Health>
+    <DamageVariants>
+      <lightdamage>0.85</lightdamage>
+      <mediumdamage>0.45</mediumdamage>
+    </DamageVariants>
+  </Health>
+  <Identity>
+    <Civ>rome</Civ>
+    <Lang>latin</Lang>
+    <GenericName>Italic Heavy Infantry</GenericName>
+    <SpecificName>Extrāōrdinārius</SpecificName>
+    <SelectionGroupName>units/rome/champion_infantry_swordsman</SelectionGroupName>
+    <Icon>units/rome_champion_infantry.png</Icon>
+    <RequiredTechnology>unlock_champion_infantry</RequiredTechnology>
+  </Identity>
+  <VisualActor>
+    <Actor>units/romans/infantry_swordsman_c.xml</Actor>
+  </VisualActor>
+</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_02.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_02.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/rome/champion_infantry_swordsman_02.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="units/rome/champion_infantry">
+<Entity parent="units/rome/champion_infantry_swordsman">
   <Identity>
     <GenericName>Marian Legionary</GenericName>
     <SpecificName>Legiōnārius</SpecificName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/sele/champion_chariot.xml
@@ -11,6 +11,7 @@
     <SpecificName>Drepanèphoros</SpecificName>
     <VisibleClasses datatype="tokens">Chariot</VisibleClasses>
     <Icon>units/sele_champion_chariot.png</Icon>
+    <RequiredTechnology>unlock_champion_chariots</RequiredTechnology>
   </Identity>
   <VisualActor>
     <Actor>units/seleucids/chariot_archer_c_m.xml</Actor>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_sword.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_sword.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_sword.xml
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_infantry_melee_swordsman">
-  <Builder>
-    <Entities datatype="tokens">
-      structures/spart/syssiton
-      structures/spart/theater
-      -structures/{civ}/wallset_stone
-    </Entities>
-  </Builder>
-  <Cost>
-    <Resources>
-      <food op="add">-10</food>
-      <metal op="add">20</metal>
-    </Resources>
-  </Cost>
-  <Identity>
-    <Civ>spart</Civ>
-    <Lang>greek</Lang>
-    <GenericName>Skiritai Commando</GenericName>
-    <SpecificName>Ékdromos Skirítēs</SpecificName>
-    <Rank>Elite</Rank>
-    <Icon>units/spart_champion_infantry_sword.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
-  </Identity>
-  <Promotion disable=""/>
-  <VisualActor>
-    <Actor>units/spartans/infantry_swordsman_c.xml</Actor>
-  </VisualActor>
-</Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/spart/champion_infantry_swordsman.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_melee_swordsman">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/spart/syssiton
+      structures/spart/theater
+      -structures/{civ}/wallset_stone
+    </Entities>
+  </Builder>
+  <Cost>
+    <Resources>
+      <food op="add">-10</food>
+      <metal op="add">20</metal>
+    </Resources>
+  </Cost>
+  <Identity>
+    <Civ>spart</Civ>
+    <Lang>greek</Lang>
+    <GenericName>Skiritai Commando</GenericName>
+    <SpecificName>Ékdromos Skirítēs</SpecificName>
+    <Rank>Elite</Rank>
+    <Icon>units/spart_champion_infantry_sword.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/spartans/infantry_swordsman_c.xml</Actor>
+  </VisualActor>
+</Entity>