Index: binaries/data/mods/public/simulation/templates/structures/athen_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/athen_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/athen_range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="27.0" depth="25.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/brit_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/brit_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/brit_range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/cart_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/cart_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/cart_range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/gaul_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/gaul_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/gaul_range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="27.0" depth="25.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/iber_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/iber_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/iber_range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="25.0" depth="22.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/kush_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/kush_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/kush_range.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="28.0" depth="26.0"/>
     <Height>12.0</Height>
   </Footprint>
+  <Health>
+    <SpawnEntityOnDeath>decay|rubble/rubble_stone_5x5</SpawnEntityOnDeath>
+  </Health>
   <Identity>
     <Civ>kush</Civ>
     <SpecificName>Pr-Pdt</SpecificName>
@@ -13,5 +16,6 @@
   </Obstruction>
   <VisualActor>
     <Actor>structures/kushites/range.xml</Actor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
   </VisualActor>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/structures/mace_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/mace_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/mace_range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="27.0" depth="25.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/maur_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/maur_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/maur_range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/pers_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/pers_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/pers_range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/ptol_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/ptol_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/ptol_range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="27.0" depth="27.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/rome_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/rome_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/rome_range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="27.0" depth="25.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/sele_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/sele_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/sele_range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="26.5" depth="26.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/structures/spart_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/structures/spart_range.xml
+++ binaries/data/mods/public/simulation/templates/structures/spart_range.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks_range">
+<Entity parent="template_structure_military_range">
   <Footprint>
     <Square width="25.0" depth="25.0"/>
     <Height>12.0</Height>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_barracks_range.xml
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks">
-  <GarrisonHolder>
-    <List datatype="tokens">Infantry -Cavalry</List>
-  </GarrisonHolder>
-  <Identity>
-    <Classes datatype="tokens">Archery</Classes>
-    <GenericName>Archery Range</GenericName>
-    <Icon>structures/range.png</Icon>
-    <Tooltip>Train citizen-soldier ranged infantry. Research training improvements.</Tooltip>
-  </Identity>
-  <ProductionQueue>
-    <BatchTimeModifier>0.8</BatchTimeModifier>
-    <Entities datatype="tokens">
-      -units/{civ}_infantry_spearman_b
-      -units/{civ}_infantry_pikeman_b
-      -units/{civ}_infantry_swordsman_b
-      units/{civ}_infantry_javelinist_b
-      units/{civ}_infantry_slinger_b
-      units/{civ}_infantry_archer_b
-    </Entities>
-  </ProductionQueue>
-  <Sound>
-    <SoundGroups>
-      <constructed>interface/complete/building/complete_range.xml</constructed>
-    </SoundGroups>
-  </Sound>
-</Entity>
Index: binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
+++ binaries/data/mods/public/simulation/templates/template_structure_military_range.xml
@@ -1,28 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_military_barracks">
+<Entity parent="template_structure_military">
+  <BuildRestrictions>
+    <Category>Range</Category>
+  </BuildRestrictions>
+  <Cost>
+    <BuildTime>150</BuildTime>
+    <Resources>
+      <wood>300</wood>
+    </Resources>
+  </Cost>
   <GarrisonHolder>
-    <List datatype="tokens">Infantry -Cavalry</List>
+    <Max>10</Max>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <List datatype="tokens">Infantry</List>
+    <BuffHeal>0</BuffHeal>
+    <LoadingRange>2</LoadingRange>
   </GarrisonHolder>
+  <Health>
+    <Max>2000</Max>
+  </Health>
   <Identity>
-    <Classes datatype="tokens">Archery</Classes>
-    <GenericName>Archery Range</GenericName>
-    <Icon>structures/range.png</Icon>
+    <GenericName>Practice Range</GenericName>
     <Tooltip>Train citizen-soldier ranged infantry. Research training improvements.</Tooltip>
+    <VisibleClasses datatype="tokens">Village Range</VisibleClasses>
+    <Icon>structures/range.png</Icon>
+    <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
+  <Loot>
+    <wood>30</wood>
+    <stone>10</stone>
+  </Loot>
   <ProductionQueue>
     <BatchTimeModifier>0.8</BatchTimeModifier>
     <Entities datatype="tokens">
-      -units/{civ}_infantry_spearman_b
-      -units/{civ}_infantry_pikeman_b
-      -units/{civ}_infantry_swordsman_b
       units/{civ}_infantry_javelinist_b
       units/{civ}_infantry_slinger_b
       units/{civ}_infantry_archer_b
     </Entities>
+    <Technologies datatype="tokens">
+      heal_barracks
+      training_conscription
+    </Technologies>
   </ProductionQueue>
   <Sound>
     <SoundGroups>
       <constructed>interface/complete/building/complete_range.xml</constructed>
+      <death>attack/destruction/building_collapse_large.xml</death>
+      <select>interface/select/building/sel_barracks.xml</select>
     </SoundGroups>
   </Sound>
+  <TerritoryInfluence>
+    <Root>false</Root>
+    <Radius>50</Radius>
+    <Weight>40000</Weight>
+  </TerritoryInfluence>
+  <Vision>
+    <Range>32</Range>
+  </Vision>
 </Entity>