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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/pers_fortress.xml
@@ -3,13 +3,8 @@
   <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>
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
+++ ps/trunk/binaries/data/mods/public/simulation/templates/template_structure_military_stable.xml
@@ -23,7 +23,7 @@
     <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>
@@ -39,9 +39,12 @@
       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