Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml	(revision 23745)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml	(revision 23746)
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military_fortress">
   <Identity>
     <Civ>pers</Civ>
     <SpecificName>Didā</SpecificName>
-    <Tooltip>Train Champions and research technologies. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Research technologies. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
-  <ProductionQueue>
-    <Entities datatype="tokens">
-      units/{civ}_champion_cavalry
-    </Entities>
-  </ProductionQueue>
   <VisualActor>
     <Actor>structures/persians/fortress.xml</Actor>
   </VisualActor>
   <WallPiece>
     <Length>24.5</Length>
     <Indent>7.6</Indent>
   </WallPiece>
 </Entity>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml	(revision 23745)
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml	(revision 23746)
@@ -1,59 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_military">
   <Cost>
     <BuildTime>150</BuildTime>
     <Resources>
       <wood>300</wood>
     </Resources>
   </Cost>
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
   </Footprint>
   <GarrisonHolder>
     <Max>10</Max>
     <List datatype="tokens">Cavalry</List>
   </GarrisonHolder>
   <Health>
     <Max>2000</Max>
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
   </Health>
   <Identity>
     <GenericName>Stable</GenericName>
     <SelectionGroupName>template_structure_military_stable</SelectionGroupName>
     <Icon>structures/pers_stable.png</Icon>
     <RequiredTechnology>phase_village</RequiredTechnology>
-    <Tooltip>Train citizen-soldier cavalry. Research training improvements.</Tooltip>
+    <Tooltip>Train Cavalry and research Cavalry technologies.</Tooltip>
     <VisibleClasses datatype="tokens">Village Stable</VisibleClasses>
   </Identity>
   <Loot>
     <wood>60</wood>
   </Loot>
   <Obstruction>
     <Static width="20.0" depth="20.0"/>
   </Obstruction>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
       units/{civ}_cavalry_swordsman_b
       units/{civ}_cavalry_spearman_b
       units/{civ}_cavalry_javelinist_b
       units/{civ}_cavalry_archer_b
+      units/{civ}_champion_cavalry
     </Entities>
     <Technologies datatype="tokens">
       heal_barracks
+      speed_cavalry_01
+      speed_cavalry_02
       persians/training_levy_cavalry
       persians/training_conscription_cavalry
       successors/special_war_horses
     </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <select>interface/select/building/sel_cavalry_stables.xml</select>
       <constructed>interface/complete/building/complete_cavalry_stables.xml</constructed>
     </SoundGroups>
   </Sound>
   <Vision>
     <Range>32</Range>
   </Vision>
 </Entity>