Index: ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js
+++ ps/trunk/binaries/data/mods/public/simulation/ai/petra/config.js
@@ -68,7 +68,7 @@
 			"structures/{civ}/embassy_italic"
 		],
 		"gaul": [
-			"structures/{civ}/tavern"
+			"structures/{civ}/assembly"
 		],
 		"iber": [
 			"structures/{civ}/monument"
Index: ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/Identity.js
@@ -65,7 +65,7 @@
 		"</element>" +
 	"</optional>" +
 	"<optional>" +
-		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Amphitheater, Archer, ArmyCamp, Arsenal, ArtilleryTower, Assembly, Axeman, Barracks, Bireme, BoltShooter, BoltTower, Bribable, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Colony, Corral, Council, Crossbowman, Defensive, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, FishingBoat, Forge, Fortress, Gate, Gladiator, Gymnasium, Hall, Healer, Hero, House, Immortal, Infantry, Javelineer, Library, Lighthouse, Maceman, Melee, Market, Mercenary, Military, Monument, Naval, Outpost, Palace, Palisade, Pikeman, Pillar, Pyramid, Quinquereme, Ram, Range, Ranged, Relic, Resource, RotaryMill, SentryTower, Ship, Shipyard, Siege, SiegeTower, SiegeWall, Slave, Slinger, Soldier, Spearman, Stable, Stoa, StoneThrower, StoneTower, Storehouse, Support, Swordsman, Syssiton, Temple, TempleOfAmun, TempleOfApedemak, TempleOfMars, TempleOfVesta, Theater, Tower, Town, Trade, Trader, Trireme, TriumphalArch, Village, Wall, Warship, Wonder, Worker.'>" +
+		"<element name='VisibleClasses' a:help='Optional list of space-separated classes applying to this entity. These classes will also be visible in various GUI elements. If the classes need spaces, underscores will be replaced with spaces. Choices include: Amphitheater, Archer, ArmyCamp, Arsenal, ArtilleryTower, Axeman, Barracks, Bireme, BoltShooter, BoltTower, Bribable, Camel, Cavalry, Champion, Chariot, Citizen, City, Civic, CivilCentre, Colony, Corral, Council, Crossbowman, Defensive, Dock, Dog, Economic, Elephant, ElephantStable, Embassy, Farmstead, Field, Fireship, FishingBoat, Forge, Fortress, Gate, Gladiator, Gymnasium, Hall, Healer, Hero, House, Immortal, Infantry, Javelineer, Library, Lighthouse, Maceman, Melee, Market, Mercenary, Military, Monument, Naval, Outpost, Palace, Palisade, Pikeman, Pillar, Pyramid, Quinquereme, Ram, Range, Ranged, Relic, Resource, RotaryMill, SentryTower, Ship, Shipyard, Siege, SiegeTower, SiegeWall, Slave, Slinger, Soldier, Spearman, Stable, Stoa, StoneThrower, StoneTower, Storehouse, Support, Swordsman, Syssiton, Temple, TempleOfAmun, TempleOfApedemak, TempleOfMars, TempleOfVesta, Theater, Tower, Town, Trade, Trader, Trireme, TriumphalArch, Village, Wall, Warship, Wonder, Worker.'>" +
 			"<attribute name='datatype'>" +
 				"<value>tokens</value>" +
 			"</attribute>" +
Index: ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/structures/gaul/assembly.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure">
+  <BuildRestrictions>
+    <Category>Council</Category>
+  </BuildRestrictions>
   <Cost>
-    <BuildTime>500</BuildTime>
+    <BuildTime>200</BuildTime>
     <Resources>
-      <stone>500</stone>
-      <metal>500</metal>
+      <wood>400</wood>
     </Resources>
   </Cost>
   <Footprint replace="">
@@ -12,7 +14,7 @@
     <Height>10.0</Height>
   </Footprint>
   <GarrisonHolder>
-    <Max>5</Max>
+    <Max>20</Max>
     <EjectHealth>0.1</EjectHealth>
     <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
     <List datatype="tokens">Support Infantry Cavalry</List>
@@ -27,17 +29,26 @@
     <Civ>gaul</Civ>
     <GenericName>Assembly of Princes</GenericName>
     <SpecificName>Remogantion</SpecificName>
-    <VisibleClasses datatype="tokens">City Assembly</VisibleClasses>
+    <Tooltip>Train Heroes.</Tooltip>
+    <Classes datatype="tokens">ConquestCritical CivSpecific</Classes>
+    <VisibleClasses datatype="tokens">City Council</VisibleClasses>
     <Icon>structures/tholos.png</Icon>
     <RequiredTechnology>phase_city</RequiredTechnology>
   </Identity>
   <Loot>
-    <stone>100</stone>
-    <metal>100</metal>
+    <wood>80</wood>
   </Loot>
   <Obstruction>
     <Static width="25.0" depth="25.0"/>
   </Obstruction>
+  <ProductionQueue>
+    <BatchTimeModifier>0.7</BatchTimeModifier>
+    <Entities datatype="tokens">
+      units/{civ}/hero_brennus
+      units/{civ}/hero_viridomarus
+      units/{civ}/hero_vercingetorix
+    </Entities>
+  </ProductionQueue>
   <Resistance>
     <Entity>
       <Damage>
@@ -48,9 +59,9 @@
     </Entity>
     <Foundation>
       <Damage>
-        <Hack>3</Hack>
+        <Hack>1</Hack>
         <Pierce>10</Pierce>
-        <Crush>3</Crush>
+        <Crush>1</Crush>
       </Damage>
     </Foundation>
   </Resistance>
@@ -62,7 +73,7 @@
   </Sound>
   <TerritoryInfluence>
     <Root>false</Root>
-    <Radius>100</Radius>
+    <Radius>40</Radius>
     <Weight>40000</Weight>
   </TerritoryInfluence>
   <Vision>
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,7 +3,7 @@
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Dunon</SpecificName>
-    <Tooltip>Territory root. Train Champion Infantry and Heroes. Garrison Soldiers for additional arrows.</Tooltip>
+    <Tooltip>Territory root. Train Champion Infantry. Garrison Soldiers for additional arrows.</Tooltip>
   </Identity>
   <Population>
     <Bonus>12</Bonus>
@@ -11,9 +11,6 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}/champion_infantry
-      units/{civ}/hero_brennus
-      units/{civ}/hero_viridomarus
-      units/{civ}/hero_vercingetorix
     </Entities>
   </ProductionQueue>
   <Sound>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/infantry_javelineer_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/infantry_javelineer_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/infantry_javelineer_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_javelineer">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/gaul/assembly
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/infantry_javelineer_b</SelectionGroupName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/infantry_slinger_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged_slinger">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/gaul/assembly
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/infantry_slinger_b</SelectionGroupName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/infantry_spearman_b.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/infantry_spearman_b.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/infantry_spearman_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_spearman">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/gaul/assembly
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <SelectionGroupName>units/gaul/infantry_spearman_b</SelectionGroupName>
Index: ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml
+++ ps/trunk/binaries/data/mods/public/simulation/templates/units/gaul/support_female_citizen.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_support_female_citizen">
+  <Builder>
+    <Entities datatype="tokens">
+      structures/gaul/assembly
+    </Entities>
+  </Builder>
   <Identity>
     <Civ>gaul</Civ>
     <GenericName>Celtic Woman</GenericName>