diff --git a/Alliance.cat b/Alliance.cat
index 8ac89f9..c9c0a55 100644
--- a/Alliance.cat
+++ b/Alliance.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="aab7-88e9-70f7-d7f1" name="Alliance v3.04" revision="16" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="aab7-88e9-70f7-d7f1" name="Alliance v3.04" revision="17" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <comment>Alliance ORBAT 3.04 (published 01/09/2023)</comment>
   <readme>Datafile history:
 0.03.00: Initial publication
@@ -17,7 +17,8 @@
 3.03.07: correction of Spatha asked in discord (ORBAT v3.03 released the 2023-02-05)
 3.04.00: new datafile for ORBAT 3.04
 3.04.01: new datafile for ORBAT 3.04 (rev.3)
-3.04.02: revivew datafile for ORBAT 3.04 (01/09/2023)</readme>
+3.04.02: revivew datafile for ORBAT 3.04 (01/09/2023)
+3.04.03: correction of datafile for ORBAT 3.04 (01/09/2023)</readme>
   <categoryEntries>
     <categoryEntry id="534c-9506-e470-8b7c" name="Alliance" publicationId="129d-da97-caec-1ddd" hidden="false"/>
     <categoryEntry id="9aab-6794-6d2b-c1a8" name="French" publicationId="129d-da97-caec-1ddd" hidden="false"/>
@@ -4013,7 +4014,8 @@
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d823-36ae-4788-b276" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d823-36ae-4788-b276" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="361a-4745-1001-05e7" type="max"/>
           </constraints>
         </entryLink>
         <entryLink id="b53b-b6f1-e765-9eaf" name="Heavy Prow Ram" hidden="false" collective="false" import="true" targetId="3b69-5936-2ff8-bc08" type="selectionEntry">
@@ -4021,7 +4023,8 @@
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2ac5-cc90-2a0f-7c52" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2ac5-cc90-2a0f-7c52" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6047-24c0-6765-ecc3" type="max"/>
           </constraints>
         </entryLink>
       </entryLinks>
@@ -5893,6 +5896,9 @@
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7a39-f789-e8c9-f512" type="max"/>
               </constraints>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+              </costs>
             </entryLink>
             <entryLink id="29c4-8b74-eb52-54e9" name="Heavy Magnetic Bombard" hidden="false" collective="false" import="true" targetId="0473-4529-d230-ee46" type="selectionEntry">
               <modifiers>
@@ -6031,10 +6037,6 @@
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c942-7d00-f80c-1901" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="51f7-5613-216a-8e6d" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -7072,12 +7074,6 @@
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6be4-472d-ca9e-7dd5" type="max"/>
-          </constraints>
-          <costs>
-            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7.0"/>
-          </costs>
         </entryLink>
       </entryLinks>
       <costs>
@@ -7969,7 +7965,7 @@
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a09e-2834-ae8d-be0e" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="4dda-8cc2-86ef-6181" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="22ed-fcf6-f576-bd3d" type="selectionEntry">
+                <entryLink id="4dda-8cc2-86ef-6181" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
@@ -7977,7 +7973,7 @@
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="170e-77dc-dca9-1728" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="b6d3-9ee3-e80d-327b" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+                <entryLink id="b6d3-9ee3-e80d-327b" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
@@ -9366,19 +9362,11 @@
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d9d8-75e3-e49b-ef49" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="71a5-7c28-7f63-8b07" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="1cc4-c2f3-5fb6-4ab4" name="Heavy Flak Broadside" hidden="false" collective="false" import="true" targetId="3e85-ccc4-d939-f7f8" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b994-161b-0269-9fc7" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d579-c4c9-57eb-f410" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -9431,6 +9419,14 @@
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="21c0-6234-66e0-ead6" type="max"/>
           </constraints>
         </entryLink>
+        <entryLink id="525b-bb8a-b223-f833" name="Francisco Solex Projector" hidden="false" collective="false" import="true" targetId="9a69-c020-577f-5b8d" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="5888-87ac-f851-165d"/>
+          </modifiers>
+          <infoLinks>
+            <infoLink id="3b7a-d1c1-969e-9457" name="Francisco Solex Projector (3.04)" hidden="false" targetId="64d5-ad27-abcc-a217" type="rule"/>
+          </infoLinks>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="124.0"/>
diff --git a/Common.cat b/Common.cat
index fe09830..c5a7a84 100644
--- a/Common.cat
+++ b/Common.cat
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="f2ed-a910-ca64-9be7" name="Common" revision="5" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="f2ed-a910-ca64-9be7" name="Common" revision="6" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <comment>Update to ORBAT 3.04 (published 01/08/2023)</comment>
   <readme>Review 3.03.00: initial library edition
 Review 3.03.01: new data
 Review 3.03.03: new data for Sultanate Orbat 3.03
 Review 3.03.04: new data for the mid April update
 Review 3.03.04: new data for the mid  September update
-Review 3.04.00: new data for the 3.04 Orbats (rev.2)</readme>
+Review 3.04.00: new data for the 3.04 Orbats (rev.2)
+Review 3.04.01: new data for the 3.04 Orbats Sept &apos;23 release</readme>
   <categoryEntries>
     <categoryEntry id="7f73-53c5-5468-f039" name="Advanced Cruiser" hidden="false"/>
     <categoryEntry id="77f5-1ac9-0fd1-f299" name="Aerial Destroyer" hidden="false"/>
@@ -169,6 +170,7 @@ Review 3.04.00: new data for the 3.04 Orbats (rev.2)</readme>
     <categoryEntry id="cb64-2db5-2cc6-c70b" name="Coastal Skimmer" hidden="false"/>
     <categoryEntry id="43a1-2c4a-1f43-32ba" name="Hover Dreadnought" publicationId="d854-a2d6-3d52-44c4" hidden="false"/>
     <categoryEntry id="d05c-710a-69b2-2c78" name="Bunker Platform" publicationId="e6a1-85d3-8979-7880" hidden="false"/>
+    <categoryEntry id="fbfb-0ffd-73fa-8e0a" name="Heavy Platform" publicationId="dbca-8d57-b848-457e" hidden="false"/>
   </categoryEntries>
   <selectionEntries>
     <selectionEntry id="401b-9932-c92b-5c5d" name="- No Patron" publicationId="5a03-1c6f-8fc8-2be1" hidden="false" collective="false" import="true" type="upgrade">
diff --git a/Commonwealth.cat b/Commonwealth.cat
index 488884c..51edbae 100644
--- a/Commonwealth.cat
+++ b/Commonwealth.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="6719-1f83-56dd-91fe" name="Commonwealth v3.04" revision="19" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="6719-1f83-56dd-91fe" name="Commonwealth v3.04" revision="20" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <comment>Commonwealth ORBAT 3.04 (published 31/08/2023)</comment>
   <readme>Review 1.02.01: correct Rurik and Oleg unit max size
 Review 1.03.00: add new unit and new profile from ORBAT 1.03, fixed Battlefleet bonus managment
@@ -19,7 +19,8 @@ Review 3.03.03: minor bug fix after update to 3.03 (publish 2023-02-05)
 Review 3.03.04: Giyena correction (publish 2023-02-05)
 Review 3.03.05: Pakhtusov correction (publish 2023-02-05)
 Review 3.04.00: new datafile for ORBAT 3.04 (rev.3)
-Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
+Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023
+Review 3.04.02: correction datafile for ORBAT 3.04 published 31/08/2023</readme>
   <categoryEntries>
     <categoryEntry id="c7ca-90d2-5214-ece9" name="Commonwealth" publicationId="e265-8c7f-a4b2-a48e" hidden="false"/>
     <categoryEntry id="43a2-7e77-ff29-fb5c" name="Russian" publicationId="e265-8c7f-a4b2-a48e" hidden="false"/>
@@ -3229,8 +3230,8 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
         <entryLink id="1858-c026-53be-5b10" name="Krykun" hidden="false" collective="false" import="true" targetId="c9c8-eda1-3b4c-5bba" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="2.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c7c9-fee0-bafe-53a4" name="Kyiv Battleship" publicationId="e265-8c7f-a4b2-a48e" page="" hidden="false" collective="false" import="true" type="model">
@@ -3655,6 +3656,9 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
           </constraints>
           <entryLinks>
             <entryLink id="4be1-7c8f-4d1d-bd6f" name="Cryogenic Blast" hidden="false" collective="false" import="true" targetId="a695-145e-2051-86b6" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="894f-9681-8368-b982" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8a19-c23d-55fa-897f" type="max"/>
@@ -3907,6 +3911,9 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
           </constraints>
           <entryLinks>
             <entryLink id="0bb1-8b58-dee9-e204" name="Cryogenic Blast" hidden="false" collective="false" import="true" targetId="a695-145e-2051-86b6" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4d89-a849-12a8-8b5b" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7249-c792-9f7c-5ebb" type="max"/>
@@ -5158,6 +5165,9 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
           </constraints>
           <entryLinks>
             <entryLink id="6b93-3aa2-5d51-cb32" name="Cryogenic Blast" hidden="false" collective="false" import="true" targetId="a695-145e-2051-86b6" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3fe2-f844-53dd-760a" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="234b-71f2-ae3b-a276" type="max"/>
@@ -5585,6 +5595,9 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
           </constraints>
           <entryLinks>
             <entryLink id="e9ed-c6db-b491-9d2c" name="Cryogenic Blast" hidden="false" collective="false" import="true" targetId="a695-145e-2051-86b6" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9a72-ad49-bfbf-a4aa" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ab25-0dd7-edb3-b94f" type="max"/>
@@ -5841,6 +5854,9 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
           </constraints>
           <entryLinks>
             <entryLink id="a49a-2360-9798-9e98" name="Cryogenic Blast" hidden="false" collective="false" import="true" targetId="a695-145e-2051-86b6" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b993-5b60-7d6f-a954" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="720a-3755-f8c5-baae" type="max"/>
@@ -6779,6 +6795,23 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="86f3-5cb5-d922-d30a" type="max"/>
           </constraints>
         </entryLink>
+        <entryLink id="1867-e1af-65d7-9ff5" name="Cryo generator" hidden="false" collective="false" import="true" targetId="1a28-0be4-37ed-6e32" type="selectionEntry">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8b65-c6bc-adac-12c8" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6463-6f8b-21f1-619c" type="max"/>
+          </constraints>
+          <entryLinks>
+            <entryLink id="ed3b-c56e-1bde-f746" name="Cryogenic Blast" hidden="false" collective="false" import="true" targetId="a695-145e-2051-86b6" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4c7d-c985-b7c4-4169" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c2b4-8834-5342-da27" type="max"/>
+              </constraints>
+            </entryLink>
+          </entryLinks>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="450.0"/>
@@ -7147,6 +7180,9 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
           </constraints>
           <entryLinks>
             <entryLink id="b5d0-5c57-2edf-e551" name="Shockwave Pulse" hidden="false" collective="false" import="true" targetId="2dfb-ebc3-cd98-5c05" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f3ff-1e6d-cabc-6ace" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="58cd-1d26-df41-96c9" type="max"/>
@@ -7823,6 +7859,9 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
           </constraints>
           <entryLinks>
             <entryLink id="066d-7384-800b-a2a3" name="Shockwave Pulse" hidden="false" collective="false" import="true" targetId="2dfb-ebc3-cd98-5c05" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7ff5-e1c9-eb73-6764" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0a90-7262-83b5-5976" type="max"/>
@@ -8455,6 +8494,9 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
           </constraints>
           <entryLinks>
             <entryLink id="fa39-add1-a01c-2aca" name="Cryogenic Blast" hidden="false" collective="false" import="true" targetId="a695-145e-2051-86b6" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3a70-9431-d4bd-9eaa" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0dee-c466-a63d-c4fb" type="max"/>
@@ -8551,6 +8593,9 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
           </constraints>
           <entryLinks>
             <entryLink id="de3c-e195-d96d-b5ad" name="Shockwave Pulse" hidden="false" collective="false" import="true" targetId="2dfb-ebc3-cd98-5c05" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4329-6255-72d7-e8fa" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9134-4cf8-1456-c51c" type="max"/>
@@ -8712,6 +8757,9 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
           </constraints>
           <entryLinks>
             <entryLink id="8c62-fbb7-9e56-ab1f" name="Cryogenic Blast" hidden="false" collective="false" import="true" targetId="a695-145e-2051-86b6" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9c89-e45b-093f-3b02" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ee86-d611-05ff-6c3f" type="max"/>
@@ -8782,9 +8830,6 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
-                  </costs>
                 </entryLink>
                 <entryLink id="9409-6156-11d8-4e05" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
@@ -9096,6 +9141,9 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
           </constraints>
           <entryLinks>
             <entryLink id="91cb-f34b-f551-2b54" name="Cryogenic Blast" hidden="false" collective="false" import="true" targetId="a695-145e-2051-86b6" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="568f-80e7-6209-844c" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="51c6-5bb5-a4f5-0b3a" type="max"/>
@@ -9837,6 +9885,9 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
           </constraints>
           <entryLinks>
             <entryLink id="9d40-582f-718e-2372" name="Cryogenic Blast" hidden="false" collective="false" import="true" targetId="a695-145e-2051-86b6" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2591-fef8-8222-3ad9" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dfd9-4f71-27b6-d83a" type="max"/>
@@ -9862,7 +9913,7 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
   </sharedSelectionEntries>
   <sharedRules>
     <rule id="a1ad-9bc7-baf3-a245" name="New Rule" hidden="false"/>
-    <rule id="ad4c-d50d-de1f-b975" name="Quantity is a Quality�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="ad4c-d50d-de1f-b975" name="Quantity is a Quality (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditions>
@@ -9872,7 +9923,7 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
       </modifiers>
       <description>If this Unit is destroyed, award Victory Points and complete any Victory Conditions as normal. Then roll a number of Action dice equal to the Round number. On one or more Explosive Hits, a single minimum sized Kutsov or Rurik Unit (of the Player’s choice) may be placed in Reserve. If more than one Explosive Hit is rolled, each additional die provides an additional Kutsov or two additional Ruriks to the Unit, depending on Unit type. The maximum size for the Unit is as indicated by the Unit entry in this ORBAT and any surplus Models generated are lost. The facing of one Action die may be replaced with an Explosive Hit if the destroyed Unit was within 7” of a Flagship Unit. This new Unit is given no further upgrades or additional Models. If it is subsequently destroyed, it can award Victory Points as normal.</description>
     </rule>
-    <rule id="357c-e17f-6054-f320" name="Slava Ukraini!�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="357c-e17f-6054-f320" name="Slava Ukraini! (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditions>
@@ -9882,7 +9933,7 @@ Review 3.04.01: updated datafile for ORBAT 3.04 published 31/08/2023</readme>
       </modifiers>
       <description>Units with the UKRAINIAN Trait. Crippled Models with this rule still use the Battle Ready value of their weapons with the Submerged Quality and may re-roll Blank Results when the Initial Target of an Assault.</description>
     </rule>
-    <rule id="b195-faa8-ae64-9494" name="Black Wolf Mercenaries�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="b195-faa8-ae64-9494" name="Black Wolf Mercenaries (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
diff --git a/Crown.cat b/Crown.cat
index fa6e2a8..c0df45a 100644
--- a/Crown.cat
+++ b/Crown.cat
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="4724-2577-5b2d-0bfe" name="Crown v3.03" revision="12" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
-  <comment>Last Crown ORBAT 3.03 (published 05/02/2023)</comment>
+<catalogue id="4724-2577-5b2d-0bfe" name="Crown v3.03" revision="13" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+  <comment>Crown ORBAT 3.04 (published 08/09/2023)</comment>
   <readme>Review 1.02.a0: Initial release
 Review 1.02.a1: minor point correction
 Review 3.02.a0: update to ORBAT 3.02a
@@ -12,7 +12,8 @@ Review 3.03.03: minor correction after the update to ORBAT 3.03 (date 2023-02-05
 Review 3.03.04: correction suggested in internet (ORBAT 3.03 released the 2023-02-05)
 Review 3.03.05: correction suggested in internet (ORBAT 3.03 released the 2023-02-05)
 Review 3.03.06: correction suggested in discord (ORBAT 3.03 released the 2023-02-05)
-Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02-05)</readme>
+Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02-05)
+Review 3.04.00: first release of 3.04 Orbat (ORBAT 3.04 2023-09-08)</readme>
   <categoryEntries>
     <categoryEntry id="6427-c580-219d-c874" name="Britannia Class" publicationId="dbca-8d57-b848-457e" hidden="false"/>
     <categoryEntry id="ddb5-f0d6-665c-3ac4" name="Protecteur Class" publicationId="dbca-8d57-b848-457e" hidden="false"/>
@@ -65,6 +66,9 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
     <categoryEntry id="5098-82a2-6f80-b36a" name="Grail Class" hidden="false"/>
     <categoryEntry id="6c4d-9a88-9e9d-ed5f" name="Guinevere Class" hidden="false"/>
     <categoryEntry id="60dd-63df-3e4d-1672" name="Torpedo Turret" hidden="false"/>
+    <categoryEntry id="31e2-a54a-eaf0-c277" name="Windsor-class" publicationId="dbca-8d57-b848-457e" hidden="false"/>
+    <categoryEntry id="bb5c-56d7-ffa2-5b05" name="Rear Weapon" hidden="false"/>
+    <categoryEntry id="f67c-be0d-7a70-d19a" name="British Vessel" hidden="false"/>
   </categoryEntries>
   <forceEntries>
     <forceEntry id="012e-2bdb-8192-e8ca" name="Crown Faction Battlefleet" publicationId="dbca-8d57-b848-457e" hidden="false">
@@ -235,7 +239,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
     </forceEntry>
     <forceEntry id="7b54-608f-353d-8628" name="British Frontline Battlefleet" publicationId="dbca-8d57-b848-457e" hidden="false">
       <infoLinks>
-        <infoLink id="d144-79bb-9c83-f2c1" name="Valorous Conduct" hidden="false" targetId="0d1b-0810-3b49-e25e" type="rule"/>
+        <infoLink id="d144-79bb-9c83-f2c1" name="Valorous Conduct (3.04)" hidden="false" targetId="0d1b-0810-3b49-e25e" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="3d9b-3a63-7799-b2ba" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="false">
@@ -504,12 +508,6 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             <constraint field="selections" scope="force" value="3.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="cd05-f52f-e971-73c0" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="e98d-8c33-057c-9c22" name="Skimming Unit" hidden="false" targetId="3b53-19a3-12fd-34b1" primary="false">
-          <constraints>
-            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="6b6a-5cd9-2d05-35fb" type="max"/>
-            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="884c-6ce0-8a38-77ef" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="8475-95c7-761b-e593" name="Submerged Unit" hidden="false" targetId="df3f-7b38-7940-f11e" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="2.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="383b-bdc4-3625-b2a3" type="max"/>
@@ -582,7 +580,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         </categoryLink>
         <categoryLink id="e1d2-4b58-9dd7-7dd4" name="Secace Class" hidden="false" targetId="4f55-03fe-35e0-e261" primary="false">
           <constraints>
-            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="d49b-8de1-cc91-88fa" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2e19-86c9-7577-3e47" type="max"/>
           </constraints>
         </categoryLink>
         <categoryLink id="a607-db2b-0544-b6e0" name="Yukon Class" hidden="false" targetId="ac46-6066-cc04-9c42" primary="false">
@@ -605,21 +603,21 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="e9cb-0c0c-eb7f-7dba" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="7ea0-5d5f-f818-95ac" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false">
+        <categoryLink id="8cb6-a142-5ea5-acf5" name="Grail Class" hidden="false" targetId="5098-82a2-6f80-b36a" primary="false">
           <constraints>
-            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="2925-4b26-ea01-6721" type="max"/>
+            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="7bff-5e81-4f2a-28c9" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="8cb6-a142-5ea5-acf5" name="Grail Class" hidden="false" targetId="5098-82a2-6f80-b36a" primary="false">
+        <categoryLink id="ef20-b6d0-d074-6648" name="B" hidden="false" targetId="f67c-be0d-7a70-d19a" primary="false">
           <constraints>
-            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="7bff-5e81-4f2a-28c9" type="max"/>
+            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="b9b3-4de7-b7e8-edfe" type="max"/>
           </constraints>
         </categoryLink>
       </categoryLinks>
     </forceEntry>
     <forceEntry id="655a-768e-4dd7-479e" name="Nautilus Battlefleet" publicationId="dbca-8d57-b848-457e" hidden="false">
       <infoLinks>
-        <infoLink id="af16-76c0-d77f-a1be" name="Command Override" hidden="false" targetId="78c8-6a85-daa7-3625" type="rule"/>
+        <infoLink id="af16-76c0-d77f-a1be" name="Command Override�" hidden="false" targetId="78c8-6a85-daa7-3625" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="face-1177-2472-3c03" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="false">
@@ -751,6 +749,53 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         </categoryLink>
       </categoryLinks>
     </forceEntry>
+    <forceEntry id="6612-327a-23a1-47a8" name="- Crown Force Patron" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+      <constraints>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4a81-5512-a953-1ad4" type="min"/>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a2df-dc92-a901-e9dd" type="max"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink id="2a69-fe1f-5ac0-e59a" name="Patron" hidden="false" targetId="d6e0-2055-9c1b-5e86" primary="false">
+          <constraints>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ccf2-f50b-b7b6-cd0b" type="min"/>
+          </constraints>
+        </categoryLink>
+      </categoryLinks>
+    </forceEntry>
+    <forceEntry id="2239-8cf9-77dd-6673" name="Crown Fortification Battleflet" hidden="false">
+      <infoLinks>
+        <infoLink id="99b6-c8c5-ce4d-c6c1" name="Familiar Locale (3.04)" hidden="false" targetId="d365-8bce-3797-d732" type="rule"/>
+      </infoLinks>
+      <categoryLinks>
+        <categoryLink id="8ba4-8cb1-cc42-928c" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="false">
+          <constraints>
+            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ff63-89e1-9086-d83f" type="min"/>
+            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d261-37dc-ac50-a586" type="max"/>
+          </constraints>
+        </categoryLink>
+        <categoryLink id="90ef-68d1-368b-e2d3" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="false">
+          <constraints>
+            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5ea7-6895-b559-ae06" type="min"/>
+            <constraint field="selections" scope="force" value="4.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="9bdf-8100-4f25-cc8d" type="max"/>
+          </constraints>
+        </categoryLink>
+        <categoryLink id="008d-04fb-addd-8240" name="Ross Class" hidden="false" targetId="cae3-7197-a87a-66a9" primary="false">
+          <constraints>
+            <constraint field="selections" scope="force" value="4.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="2c2e-0c5d-6f7a-de72" type="max"/>
+          </constraints>
+        </categoryLink>
+        <categoryLink id="07a9-9539-cc20-b96e" name="Dublin Class" hidden="false" targetId="ff20-d441-da28-93f5" primary="false">
+          <constraints>
+            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="9ec8-5b48-3af3-3f25" type="max"/>
+          </constraints>
+        </categoryLink>
+        <categoryLink id="2e54-4de2-1dd5-3b52" name="Belfast Class" hidden="false" targetId="128d-7d4d-d692-0978" primary="false">
+          <constraints>
+            <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="7f16-c08a-22aa-e42b" type="max"/>
+          </constraints>
+        </categoryLink>
+      </categoryLinks>
+    </forceEntry>
   </forceEntries>
   <selectionEntries>
     <selectionEntry id="0e8c-af8d-bfbe-868f" name="Orca Hunter Submarines Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -761,6 +806,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
               <conditions>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -769,6 +815,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="e70b-9ec4-822e-2a7b" name="Orca Class" hidden="false" targetId="67f5-80e9-aef2-3097" primary="false"/>
         <categoryLink id="4b1b-d251-2e7d-33a9" name="New CategoryLink" hidden="false" targetId="df3f-7b38-7940-f11e" primary="true"/>
+        <categoryLink id="166a-8641-359a-4529" name="Canadian" hidden="false" targetId="d4a3-52d1-9941-7ffb" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="22e0-d843-43e3-7a16" name="Orca" hidden="false" collective="false" import="true" targetId="9bdd-872b-dbfb-4a53" type="selectionEntry"/>
@@ -788,6 +835,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -796,6 +844,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="8e59-42d8-b0b2-55a8" name="Yukon Class" hidden="false" targetId="ac46-6066-cc04-9c42" primary="false"/>
         <categoryLink id="4cec-7ba8-6547-eb71" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
+        <categoryLink id="cc0f-3f4a-9f0a-b3c4" name="Canadian" hidden="false" targetId="d4a3-52d1-9941-7ffb" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="67a0-bd1c-35d8-a5c1" name="Yukon" hidden="false" collective="false" import="true" targetId="1561-753f-2beb-4cfb" type="selectionEntry"/>
@@ -815,6 +864,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -839,6 +889,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -872,6 +923,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <categoryLink id="4de0-8f7f-5877-9d6b" name="Picton Class" hidden="false" targetId="d3ce-dad9-4684-d657" primary="false"/>
         <categoryLink id="fb80-6c7c-962a-c446" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="6d0d-aa3a-0db2-ab31" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
+        <categoryLink id="cdf2-abcf-221b-2e4e" name="B" hidden="false" targetId="f67c-be0d-7a70-d19a" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="7793-2c36-aea7-c3be" name="Picton" hidden="false" collective="false" import="true" targetId="0170-c308-289d-ff01" type="selectionEntry"/>
@@ -888,6 +940,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -896,6 +949,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="7f94-2d4a-6d12-d94f" name="Morgana Class" hidden="false" targetId="cb90-9d6d-4a1b-d87e" primary="false"/>
         <categoryLink id="bc02-bb79-d3bc-0663" name="New CategoryLink" hidden="false" targetId="df3f-7b38-7940-f11e" primary="true"/>
+        <categoryLink id="183e-c825-118a-1869" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="4952-3ac2-c45a-2a32" name="Morgana" hidden="false" collective="false" import="true" targetId="9ef8-3212-8fb5-4b55" type="selectionEntry"/>
@@ -912,6 +966,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -945,6 +1000,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <categoryLink id="bc0e-ad9c-8f11-a765" name="Lancelot Class" hidden="false" targetId="2315-8265-0cb0-b2a7" primary="false"/>
         <categoryLink id="0c8e-ad02-2e1f-79a8" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="5762-91c5-7a3e-7f00" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
+        <categoryLink id="e975-a843-70ce-587b" name="B" hidden="false" targetId="f67c-be0d-7a70-d19a" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="bdeb-fd0b-1b43-b9ea" name="Lancelot" hidden="false" collective="false" import="true" targetId="55c5-8998-e45f-3d6f" type="selectionEntry"/>
@@ -961,6 +1017,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -994,6 +1051,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <categoryLink id="170d-b409-c313-810d" name="Hotspur Class" hidden="false" targetId="a683-0b8f-09f3-7880" primary="false"/>
         <categoryLink id="f5d4-fb7a-5a7a-7670" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
         <categoryLink id="52f1-dfa9-2529-5a37" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
+        <categoryLink id="6757-f8b2-4292-4762" name="B" hidden="false" targetId="f67c-be0d-7a70-d19a" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="25f1-d840-4f0e-7b9c" name="Hotspur" hidden="false" collective="false" import="true" targetId="fd72-a8a0-a24d-349e" type="selectionEntry"/>
@@ -1008,6 +1066,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           <constraints>
             <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d748-f73d-5fee-cffb" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f1cb-ae84-fa6c-bf70" type="max"/>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="90a0-9963-8d76-db37" type="max"/>
           </constraints>
         </entryLink>
       </entryLinks>
@@ -1023,6 +1082,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1056,6 +1116,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <categoryLink id="079e-49c2-8707-2bf2" name="Excalibur Class" hidden="false" targetId="ce49-79cb-7795-08b2" primary="false"/>
         <categoryLink id="bb4d-fb9b-3919-07b6" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="a5ce-05da-460d-dfd1" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
+        <categoryLink id="1dd0-7e49-2e12-157a" name="B" hidden="false" targetId="f67c-be0d-7a70-d19a" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="e908-b7bd-ee9a-1b40" name="Excalibur" hidden="false" collective="false" import="true" targetId="2f17-6256-56c3-1725" type="selectionEntry"/>
@@ -1075,6 +1136,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1100,6 +1162,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1133,6 +1196,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <categoryLink id="42fb-4c55-6689-bedd" name="Albion Class" hidden="false" targetId="b6a5-4bf0-cc7d-cef0" primary="false"/>
         <categoryLink id="b2d6-81b7-3932-48b8" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="95b4-eaa1-56fa-d5b4" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
+        <categoryLink id="7462-6fb7-1fa5-8021" name="B" hidden="false" targetId="f67c-be0d-7a70-d19a" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="9cd3-0ddf-dd38-211c" name="Albion" hidden="false" collective="false" import="true" targetId="3391-de44-4f50-9776" type="selectionEntry"/>
@@ -1149,6 +1213,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1182,6 +1247,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <categoryLink id="56cc-67fa-80ba-8b17" name="Caliburn Class" hidden="false" targetId="6404-9e52-94ad-87cd" primary="false"/>
         <categoryLink id="fa9b-51bd-b490-92c4" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="75f4-4cf3-fdbd-96cd" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
+        <categoryLink id="afaa-43a5-3710-c15d" name="B" hidden="false" targetId="f67c-be0d-7a70-d19a" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="3c68-27c2-3cf8-ca9e" name="Caliburn" hidden="false" collective="false" import="true" targetId="9482-5ed0-b7b8-e060" type="selectionEntry"/>
@@ -1193,27 +1259,28 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
     </selectionEntry>
     <selectionEntry id="8fd8-cbe5-e866-96c1" name="Agincourt Bombardment Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
-        <modifier type="set" field="hidden" value="true">
+        <modifier type="add" field="category" value="b20c-c6ec-bdc4-faed">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
-        <modifier type="add" field="category" value="b20c-c6ec-bdc4-faed">
+        <modifier type="set" field="hidden" value="true">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
         <modifier type="add" field="category" value="d4a3-52d1-9941-7ffb">
           <conditions>
-            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
+            <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
           </conditions>
         </modifier>
         <modifier type="remove" field="category" value="fffb-149d-6db1-4439">
@@ -1231,52 +1298,8 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <categoryLink id="7764-2744-ae33-687a" name="Agincourt Class" hidden="false" targetId="eedb-3308-3474-4f3b" primary="false"/>
         <categoryLink id="2b7c-d956-a821-fc75" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="0a81-e8e8-f343-5cb0" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
+        <categoryLink id="cb1a-39b5-5510-7569" name="B" hidden="false" targetId="f67c-be0d-7a70-d19a" primary="false"/>
       </categoryLinks>
-      <selectionEntryGroups>
-        <selectionEntryGroup id="ab47-eb9f-a833-74f2" name="Front Battery" hidden="false" collective="false" import="true">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3786-2c9d-4b82-b233" type="max"/>
-          </constraints>
-          <selectionEntries>
-            <selectionEntry id="b185-7f4a-0bca-caf7" name="Gun Battery" hidden="false" collective="false" import="true" type="upgrade">
-              <modifiers>
-                <modifier type="add" field="category" value="61b1-7830-7924-391d"/>
-              </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5afb-ca96-eb23-f413" type="max"/>
-              </constraints>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
-                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-              </costs>
-            </selectionEntry>
-            <selectionEntry id="eb11-0bc0-1180-458a" name="Rocket Battery" hidden="false" collective="false" import="true" type="upgrade">
-              <modifiers>
-                <modifier type="add" field="category" value="ccff-8bb4-a85a-6bbc"/>
-              </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4b0c-d9c4-b6db-004a" type="max"/>
-              </constraints>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="12.0"/>
-                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-              </costs>
-            </selectionEntry>
-            <selectionEntry id="e537-5b68-cc71-88c4" name="Torpedo Turret" hidden="false" collective="false" import="true" type="upgrade">
-              <modifiers>
-                <modifier type="add" field="category" value="60dd-63df-3e4d-1672"/>
-              </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bb45-12fa-481e-04fa" type="max"/>
-              </constraints>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="12.0"/>
-                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-              </costs>
-            </selectionEntry>
-          </selectionEntries>
-        </selectionEntryGroup>
-      </selectionEntryGroups>
       <entryLinks>
         <entryLink id="54bb-95a7-702e-1b3d" name="Agincourt" hidden="false" collective="false" import="true" targetId="3919-a80d-c0f2-d6e6" type="selectionEntry"/>
       </entryLinks>
@@ -1292,6 +1315,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1325,6 +1349,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <categoryLink id="c4b7-c779-18f1-c2de" name="Bedivere Class" hidden="false" targetId="d50a-ca78-5e3b-8fb7" primary="false"/>
         <categoryLink id="da13-4c93-95ca-f88b" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="e51a-e4f3-a532-cb17" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
+        <categoryLink id="92a3-243b-77f4-1879" name="B" hidden="false" targetId="f67c-be0d-7a70-d19a" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="3f94-5a44-d3ac-68c5" name="Bedivere" hidden="false" collective="false" import="true" targetId="36b8-c29d-c7c7-9d48" type="selectionEntry"/>
@@ -1341,6 +1366,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1374,52 +1400,8 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <categoryLink id="e6ad-5688-7331-1d2c" name="Athelstan Class" hidden="false" targetId="a4c7-ed2c-6f9a-1a54" primary="false"/>
         <categoryLink id="21d6-ff57-73dd-3a4c" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="f92a-d5c4-2917-b86e" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
+        <categoryLink id="8621-44c4-7de3-4524" name="B" hidden="false" targetId="f67c-be0d-7a70-d19a" primary="false"/>
       </categoryLinks>
-      <selectionEntryGroups>
-        <selectionEntryGroup id="af8c-2a26-665b-368c" name="Front Battery" hidden="false" collective="false" import="true">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="41f5-66b5-f4b6-e338" type="max"/>
-          </constraints>
-          <selectionEntries>
-            <selectionEntry id="9588-2849-b229-49e8" name="Gun Battery" hidden="false" collective="false" import="true" type="upgrade">
-              <modifiers>
-                <modifier type="add" field="category" value="61b1-7830-7924-391d"/>
-              </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bce3-6426-400d-4e33" type="max"/>
-              </constraints>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
-                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-              </costs>
-            </selectionEntry>
-            <selectionEntry id="d140-7b7e-26d3-f36f" name="Rocket Battery" hidden="false" collective="false" import="true" type="upgrade">
-              <modifiers>
-                <modifier type="add" field="category" value="ccff-8bb4-a85a-6bbc"/>
-              </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="513a-6dde-6e57-1324" type="max"/>
-              </constraints>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="12.0"/>
-                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-              </costs>
-            </selectionEntry>
-            <selectionEntry id="3858-dafb-248e-5277" name="Torpedo Turret" hidden="false" collective="false" import="true" type="upgrade">
-              <modifiers>
-                <modifier type="add" field="category" value="60dd-63df-3e4d-1672"/>
-              </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c58f-7d02-041b-974b" type="max"/>
-              </constraints>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="12.0"/>
-                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-              </costs>
-            </selectionEntry>
-          </selectionEntries>
-        </selectionEntryGroup>
-      </selectionEntryGroups>
       <entryLinks>
         <entryLink id="0657-aa06-1283-417c" name="Athelstan" hidden="false" collective="false" import="true" targetId="dcca-9848-0265-fdcb" type="selectionEntry"/>
       </entryLinks>
@@ -1438,6 +1420,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1467,6 +1450,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1475,6 +1459,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="0c29-a81a-866a-35ec" name="New CategoryLink" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
         <categoryLink id="b421-1b69-7fb3-008d" name="Sabre squadron" hidden="false" targetId="1ed7-e280-a0e5-78b8" primary="false"/>
+        <categoryLink id="e997-ca31-4837-6ccb" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="54ed-fd5f-5c4b-af06" name="Escort Model" hidden="false" collective="false" import="true">
@@ -1583,6 +1568,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1594,6 +1580,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="3c90-9021-4dd5-9bc5" name="New CategoryLink" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
         <categoryLink id="2d12-b974-6c3e-62c1" name="Victory Class" hidden="false" targetId="3c0e-3931-32d5-b795" primary="false"/>
+        <categoryLink id="6cdc-6e47-c33f-96aa" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="0f2b-dd67-5a50-f659" name="Escort Model" hidden="false" collective="false" import="true">
@@ -1702,6 +1689,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1773,16 +1761,16 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="f7ac-e83d-e895-7bb7" name="Albion Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
+            <selectionEntry id="4d45-0e4c-ce5a-ee98" name="Albion Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
               <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5ee1-9b2e-dc97-83d1" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f722-a2a9-7195-2785" type="max"/>
               </constraints>
               <categoryLinks>
-                <categoryLink id="23ac-595a-dd52-b761" name="Albion Class" hidden="false" targetId="b6a5-4bf0-cc7d-cef0" primary="false"/>
-                <categoryLink id="5d13-4649-db05-e4c2" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
+                <categoryLink id="6f54-613f-05cb-92e2" name="Albion Class" hidden="false" targetId="b6a5-4bf0-cc7d-cef0" primary="false"/>
+                <categoryLink id="3678-c0e9-0e5d-f83d" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
               </categoryLinks>
               <entryLinks>
-                <entryLink id="ecc3-b33d-8875-7db1" name="Albion" hidden="false" collective="false" import="true" targetId="3391-de44-4f50-9776" type="selectionEntry">
+                <entryLink id="ab39-8e12-c9d5-3a6f" name="Albion" hidden="false" collective="false" import="true" targetId="3391-de44-4f50-9776" type="selectionEntry">
                   <modifiers>
                     <modifier type="set" field="e3bb-7676-dcf0-db3b" value="1.0"/>
                   </modifiers>
@@ -1815,6 +1803,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1823,6 +1812,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="a4e5-8dae-611c-75b4" name="New CategoryLink" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
         <categoryLink id="6a51-2630-dddf-4ed1" name="Victory Class" hidden="false" targetId="3c0e-3931-32d5-b795" primary="false"/>
+        <categoryLink id="a70c-6a8a-2e05-d1f8" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="9890-8f87-6fed-e2b0" name="Escort Model" hidden="false" collective="false" import="true">
@@ -1931,6 +1921,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -1939,7 +1930,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="2dbf-814f-40c5-7c00" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
         <categoryLink id="d8ff-1690-cd8f-b7af" name="Sabre Class" hidden="false" targetId="27ee-3bf4-f5b4-ea57" primary="false"/>
-        <categoryLink id="dfb9-f262-08c0-c023" name="Sabre squadron" hidden="false" targetId="1ed7-e280-a0e5-78b8" primary="false"/>
+        <categoryLink id="2fad-8109-1dd1-7b51" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="affd-d5f7-38b4-63f6" name="Escort Model" hidden="false" collective="false" import="true">
@@ -2080,6 +2071,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -2088,39 +2080,9 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="bdd2-2477-fdfd-a0d5" name="New CategoryLink" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
         <categoryLink id="4d57-e6f3-d5eb-066a" name="Toronto Class" hidden="false" targetId="01d6-2c71-3552-49ae" primary="false"/>
+        <categoryLink id="9a63-c7cb-e85e-4ba9" name="Canadian" hidden="false" targetId="d4a3-52d1-9941-7ffb" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="2d66-d061-4668-6a00" name="Rear Battery" hidden="false" collective="false" import="true">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3c38-e568-a0f2-fd7c" type="max"/>
-          </constraints>
-          <selectionEntries>
-            <selectionEntry id="501a-26ce-4afe-31d5" name="Gun Battery" hidden="false" collective="false" import="true" type="upgrade">
-              <modifiers>
-                <modifier type="add" field="category" value="61b1-7830-7924-391d"/>
-              </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3b1c-c1c8-2cca-07a4" type="max"/>
-              </constraints>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="30.0"/>
-                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-              </costs>
-            </selectionEntry>
-            <selectionEntry id="78eb-3e40-3aaa-e72f" name="Rocket Battery" hidden="false" collective="false" import="true" type="upgrade">
-              <modifiers>
-                <modifier type="add" field="category" value="ccff-8bb4-a85a-6bbc"/>
-              </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f917-5823-b358-549a" type="max"/>
-              </constraints>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="45.0"/>
-                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-              </costs>
-            </selectionEntry>
-          </selectionEntries>
-        </selectionEntryGroup>
         <selectionEntryGroup id="5651-d2fa-e4e2-1eb7" name="Escort Model" hidden="false" collective="false" import="true">
           <constraints>
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="813e-4e7e-e7c5-371d" type="max"/>
@@ -2207,6 +2169,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -2215,6 +2178,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="85d6-f17f-f98c-7cdd" name="New CategoryLink" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
         <categoryLink id="2337-91ef-efcd-9ac1" name="Protecteur Class" hidden="false" targetId="ddb5-f0d6-665c-3ac4" primary="false"/>
+        <categoryLink id="84e0-8ca0-d80c-fdeb" name="Canadian" hidden="false" targetId="d4a3-52d1-9941-7ffb" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="7ad5-8593-15d8-c789" name="Attached Unit" hidden="false" collective="false" import="true">
@@ -2320,6 +2284,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="964e-9d87-c9a4-c6ad" name="Tintagel Class" hidden="false" targetId="c8fb-856e-ddff-0c9f" primary="false"/>
         <categoryLink id="4da2-df91-38dd-7b7f" name="Aerial Unit" hidden="false" targetId="022b-08af-c874-e3f1" primary="true"/>
+        <categoryLink id="eb28-5ec6-6581-e026" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="860a-fc0e-0108-97a3" name="Tintagel" hidden="false" collective="false" import="true" targetId="eb54-5b59-a236-9589" type="selectionEntry"/>
@@ -2390,16 +2355,23 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="012e-2bdb-8192-e8ca" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="1304-5f0a-eea7-10fd" name="New CategoryLink" hidden="false" targetId="022b-08af-c874-e3f1" primary="true"/>
         <categoryLink id="96e5-fd46-467f-607c" name="Prydain Class" hidden="false" targetId="45d9-d5ed-03ea-3310" primary="false"/>
+        <categoryLink id="a724-333c-a19c-6f97" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
+        <categoryLink id="4e64-dc40-9bfd-7267" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="7217-38de-097e-102d" name="Prydain" hidden="false" collective="false" import="true" targetId="ebe7-a2f0-c340-1e0c" type="selectionEntry"/>
@@ -2415,6 +2387,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
               </conditions>
             </conditionGroup>
@@ -2449,13 +2422,14 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <categoryLink id="c18c-8528-d6b1-dd04" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="220b-081c-641c-b48f" name="Secace Class" hidden="false" targetId="4f55-03fe-35e0-e261" primary="false"/>
         <categoryLink id="ec09-b5c4-0a2b-4021" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
+        <categoryLink id="afd4-463b-8bce-2b0a" name="B" hidden="false" targetId="f67c-be0d-7a70-d19a" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="1b46-ff6b-8cb3-4ae7" name="Secace" hidden="false" collective="false" import="true" targetId="bae7-03e9-ce08-82fb" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="4.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="125f-5438-e246-3ba9" name="Ross Battle Platforms" hidden="false" collective="false" import="true" type="unit">
@@ -2487,7 +2461,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="1fd6-e961-fe07-62d3" name="Dublin War Platform" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="1fd6-e961-fe07-62d3" name="Dublin Heavy Platform" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="model">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -2507,7 +2481,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="142f-1b82-a0c0-a5f2" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="b962-8ec4-02b1-65dd" name="Dublin Class" hidden="false" targetId="ff20-d441-da28-93f5" primary="false"/>
-        <categoryLink id="38fd-4d53-8aa6-31c9" name="Irish" hidden="false" targetId="bf1b-5d15-a572-6d42" primary="false"/>
+        <categoryLink id="80b4-5cf6-24e8-5565" name="Irish" hidden="false" targetId="bf1b-5d15-a572-6d42" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="7fe8-88ba-c198-bb0b" name="Attached Unit" hidden="false" collective="false" import="true">
@@ -2554,6 +2528,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -2666,6 +2641,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -2676,6 +2652,71 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <categoryLink id="3bb1-0495-40c3-8c3e" name="Avalon Class" hidden="false" targetId="7aac-825d-39cf-beac" primary="false"/>
         <categoryLink id="7b5a-8843-a3bc-207a" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
       </categoryLinks>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="7411-c4bb-dd79-3059" name="Attached Unit" hidden="false" collective="false" import="true">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5c29-4926-3c8e-0c38" type="max"/>
+          </constraints>
+          <selectionEntries>
+            <selectionEntry id="3c43-52fe-c367-217c" name="Tintagel Battle Rotor Squadron" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="unit">
+              <modifiers>
+                <modifier type="add" field="category" value="b20c-c6ec-bdc4-faed">
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+                <modifier type="remove" field="category" value="fffb-149d-6db1-4439">
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="ddb5-f0d6-665c-3ac4" type="atLeast"/>
+                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="01d6-2c71-3552-49ae" type="atLeast"/>
+                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+                <modifier type="add" field="category" value="d4a3-52d1-9941-7ffb">
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="ddb5-f0d6-665c-3ac4" type="atLeast"/>
+                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="01d6-2c71-3552-49ae" type="atLeast"/>
+                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+                <modifier type="remove" field="category" value="fffb-149d-6db1-4439">
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+              </modifiers>
+              <categoryLinks>
+                <categoryLink id="f9eb-26c2-5788-ff46" name="Tintagel Class" hidden="false" targetId="c8fb-856e-ddff-0c9f" primary="false"/>
+                <categoryLink id="8128-dda6-3226-0ef8" name="Aerial Unit" hidden="false" targetId="022b-08af-c874-e3f1" primary="true"/>
+              </categoryLinks>
+              <entryLinks>
+                <entryLink id="8876-501f-0a00-7e07" name="Tintagel" hidden="false" collective="false" import="true" targetId="eb54-5b59-a236-9589" type="selectionEntry"/>
+              </entryLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
       <entryLinks>
         <entryLink id="bbda-eb77-1a5b-f9aa" name="Avalon" hidden="false" collective="false" import="true" targetId="fb3d-c2b8-3fd9-e6b9" type="selectionEntry"/>
       </entryLinks>
@@ -2690,11 +2731,12 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -2745,6 +2787,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -2913,12 +2956,9 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="012e-2bdb-8192-e8ca" type="instanceOf"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -2944,7 +2984,8 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       </modifiers>
       <categoryLinks>
         <categoryLink id="1c4f-8498-d6b8-38aa" name="Prydain Class" hidden="false" targetId="45d9-d5ed-03ea-3310" primary="false"/>
-        <categoryLink id="d350-daa1-da8b-b964" name="New CategoryLink" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
+        <categoryLink id="e35e-6f4d-37d4-d172" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
+        <categoryLink id="2c54-d6b6-aca4-7191" name="New CategoryLink" hidden="false" targetId="022b-08af-c874-e3f1" primary="true"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="0cca-d85b-8bae-8795" name="Prydain" hidden="false" collective="false" import="true" targetId="ebe7-a2f0-c340-1e0c" type="selectionEntry"/>
@@ -2954,36 +2995,6 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="3136-363a-e427-ff74" name="Nautilus" hidden="false" collective="false" import="true" type="model">
-      <modifiers>
-        <modifier type="set" field="hidden" value="true">
-          <conditionGroups>
-            <conditionGroup type="or">
-              <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
-              </conditions>
-            </conditionGroup>
-          </conditionGroups>
-        </modifier>
-      </modifiers>
-      <categoryLinks>
-        <categoryLink id="ae37-5062-3e54-a5bf" name="Privateer" hidden="false" targetId="1e28-4ab8-662e-f4c3" primary="false"/>
-        <categoryLink id="b660-d9ef-1b01-113f" name="Nautilus" hidden="false" targetId="7197-2a46-f613-28a1" primary="false"/>
-        <categoryLink id="17ae-15c4-20c0-1883" name="New CategoryLink" hidden="false" targetId="df3f-7b38-7940-f11e" primary="true"/>
-      </categoryLinks>
-      <entryLinks>
-        <entryLink id="0143-f144-7a49-cf9c" name="Nautilus" hidden="false" collective="false" import="true" targetId="3928-e9df-5505-fc75" type="selectionEntry"/>
-      </entryLinks>
-      <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
-        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-      </costs>
-    </selectionEntry>
     <selectionEntry id="7844-bf13-3093-fd25" name="Nautilus" hidden="false" collective="false" import="true" type="model">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
@@ -2996,6 +3007,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="012e-2bdb-8192-e8ca" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -3025,6 +3037,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -3036,6 +3049,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="edd5-056d-4e8a-b7d1" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
         <categoryLink id="b055-91b3-f84e-37c9" name="Britannia Class" hidden="false" targetId="6427-c580-219d-c874" primary="false"/>
+        <categoryLink id="e5e5-6807-8a32-cc8c" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="3ac9-0471-cc63-8c3b" name="Attached Unit" hidden="false" collective="false" import="true">
@@ -3125,6 +3139,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -3136,6 +3151,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="a8be-97f4-8540-b7b7" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
         <categoryLink id="a946-656c-f4f0-e733" name="Britannia Class" hidden="false" targetId="6427-c580-219d-c874" primary="false"/>
+        <categoryLink id="8552-6d15-1f48-3790" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="39c2-f0d8-bd3b-2968" name="Escort Model" hidden="false" collective="false" import="true">
@@ -3240,6 +3256,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -3251,6 +3268,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="8243-f46d-460f-ed15" name="New CategoryLink" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
         <categoryLink id="e6e1-3dc6-00cf-ec84" name="Protecteur Class" hidden="false" targetId="ddb5-f0d6-665c-3ac4" primary="false"/>
+        <categoryLink id="e383-357e-016a-1eaf" name="Canadian" hidden="false" targetId="d4a3-52d1-9941-7ffb" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="8034-5a2c-6724-fb4b" name="Attached Unit" hidden="false" collective="false" import="true">
@@ -3319,6 +3337,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -3329,7 +3348,8 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       </constraints>
       <categoryLinks>
         <categoryLink id="9064-6dbd-f5e9-67a2" name="New CategoryLink" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
-        <categoryLink id="091e-b6e2-cd60-423f" name="Gloriana Class" hidden="false" targetId="0867-653c-99f4-e50a" primary="false"/>
+        <categoryLink id="8580-2e7c-fbf0-9cb5" name="Camelot Class" hidden="false" targetId="a6ac-3d74-b227-9660" primary="false"/>
+        <categoryLink id="dd23-8f3e-2f4c-5fba" name="Canadian" hidden="false" targetId="d4a3-52d1-9941-7ffb" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="9db1-af8e-769a-9f14" name="Escort Model" hidden="false" collective="false" import="true">
@@ -3423,13 +3443,14 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="5912-711b-c3b7-c99f" name="Grail Fast Destroyer" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="5912-711b-c3b7-c99f" name="Grail Gyro-Bomb Carrier" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -3463,6 +3484,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <categoryLink id="1b3b-ace7-a8fc-e36d" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
         <categoryLink id="d7a3-75fd-ee61-e45d" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
         <categoryLink id="5587-8296-2170-a86d" name="Grail Class" hidden="false" targetId="5098-82a2-6f80-b36a" primary="false"/>
+        <categoryLink id="436c-6b57-a198-19bb" name="B" hidden="false" targetId="f67c-be0d-7a70-d19a" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="7dd0-f97c-7087-b05e" name="Grail" hidden="false" collective="false" import="true" targetId="8ad0-2f74-2bf1-35ea" type="selectionEntry"/>
@@ -3479,6 +3501,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -3487,6 +3510,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       <categoryLinks>
         <categoryLink id="3c70-3281-89f0-851e" name="New CategoryLink" hidden="false" targetId="df3f-7b38-7940-f11e" primary="true"/>
         <categoryLink id="adc7-eb09-d6a4-6a71" name="Guinevere Class" hidden="false" targetId="6c4d-9a88-9e9d-ed5f" primary="false"/>
+        <categoryLink id="1115-6e9e-c7f3-6099" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="d574-ddeb-efaa-a73f" name="Guinevere" hidden="false" collective="false" import="true" targetId="94b8-bb98-431a-69be" type="selectionEntry"/>
@@ -3496,62 +3520,43 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="9a4f-37c3-6a10-38f1" name="Sabre Command Cruisers Squadron" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="2b5b-96c0-068a-3aa6" name="Windsor War Platform" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="model">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
             <conditionGroup type="or">
               <conditions>
-                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
                 <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
         </modifier>
       </modifiers>
       <categoryLinks>
-        <categoryLink id="0411-e4ee-53c6-6321" name="Sabre squadron" hidden="false" targetId="1ed7-e280-a0e5-78b8" primary="false"/>
-        <categoryLink id="9caa-c594-7ca6-b2a9" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
+        <categoryLink id="f938-72d0-421f-d27a" name="Windsor-class" hidden="false" targetId="31e2-a54a-eaf0-c277" primary="false"/>
+        <categoryLink id="525b-14cf-181e-f72e" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
+        <categoryLink id="088b-3f83-1d78-9abd" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="2871-c4e9-4b79-0696" name="Escort Model" hidden="false" collective="false" import="true">
-          <constraints>
-            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6125-d4b0-1b70-097a" type="max"/>
-          </constraints>
-          <entryLinks>
-            <entryLink id="bb09-4959-7eff-cb9d" name="Escort Token" hidden="false" collective="false" import="true" targetId="9cc1-48f6-f9ea-943f" type="selectionEntry">
-              <constraints>
-                <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f9b6-2e20-fbc6-a990" type="min"/>
-                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="122d-9676-975e-5021" type="max"/>
-              </constraints>
-              <categoryLinks>
-                <categoryLink id="84f5-fa2c-efe9-6663" name="Escort Class" hidden="false" targetId="a8dc-2c16-e614-7894" primary="false"/>
-              </categoryLinks>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="8.0"/>
-              </costs>
-            </entryLink>
-          </entryLinks>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="0883-115b-6b92-95ed" name="Attached Unit" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="4cb4-d65c-25e6-06b7" name="Attached Unit" hidden="false" collective="false" import="true">
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1f99-a76e-31fe-c617" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dc33-4bc1-9eac-9ffc" type="max"/>
           </constraints>
           <selectionEntries>
-            <selectionEntry id="3913-8809-6045-142f" name="Hotspur Support Carrier Squadron" hidden="false" collective="false" import="true" type="unit">
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f74f-8064-65f2-260c" type="max"/>
-              </constraints>
+            <selectionEntry id="6926-f3c1-e975-7562" name="Ross Battle Platforms" hidden="false" collective="false" import="true" type="unit">
               <categoryLinks>
-                <categoryLink id="a943-0bb0-9e97-6eb4" name="New CategoryLink" hidden="false" targetId="d216-bc05-71f1-0fb4" primary="true"/>
-                <categoryLink id="c6ff-6c1e-1199-bb78" name="Hotspur Class" hidden="false" targetId="a683-0b8f-09f3-7880" primary="false"/>
+                <categoryLink id="1eba-f773-4f2e-a3b6" name="Orca Class" hidden="false" targetId="67f5-80e9-aef2-3097" primary="false"/>
+                <categoryLink id="00a6-8e25-0109-91e6" name="New CategoryLink" hidden="false" targetId="df3f-7b38-7940-f11e" primary="true"/>
               </categoryLinks>
               <entryLinks>
-                <entryLink id="1a6b-ebbb-3757-541d" name="Hotspur" hidden="false" collective="false" import="true" targetId="fd72-a8a0-a24d-349e" type="selectionEntry">
+                <entryLink id="9d71-078e-bb47-d6ff" name="Ross" hidden="false" collective="false" import="true" targetId="27d9-943b-1840-698b" type="selectionEntry">
                   <modifiers>
-                    <modifier type="set" field="37b2-91c6-039a-df19" value="1.0"/>
+                    <modifier type="set" field="151a-cbeb-6cf8-6165" value="1.0"/>
                   </modifiers>
                 </entryLink>
               </entryLinks>
@@ -3560,18 +3565,29 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="dc83-bba4-c9e9-67d7" name="Athelstan Flak Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
+            <selectionEntry id="c37f-ec44-05a5-d816" name="Albion Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
+              <modifiers>
+                <modifier type="set" field="hidden" value="true">
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+              </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="72c5-4c39-f6bd-c3f3" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ec66-f1f9-01d8-a815" type="max"/>
               </constraints>
               <categoryLinks>
-                <categoryLink id="20a1-2161-d795-958a" name="Athelstan Class" hidden="false" targetId="a4c7-ed2c-6f9a-1a54" primary="false"/>
-                <categoryLink id="3192-a1e1-6ad1-7eb2" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
+                <categoryLink id="f641-bac2-cce1-3fb8" name="Albion Class" hidden="false" targetId="b6a5-4bf0-cc7d-cef0" primary="false"/>
+                <categoryLink id="c0ec-b6e3-c66a-7574" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
               </categoryLinks>
               <entryLinks>
-                <entryLink id="2251-7354-774e-a67f" name="Athelstan" hidden="false" collective="false" import="true" targetId="dcca-9848-0265-fdcb" type="selectionEntry">
+                <entryLink id="6be4-2476-accc-3c77" name="Albion" hidden="false" collective="false" import="true" targetId="3391-de44-4f50-9776" type="selectionEntry">
                   <modifiers>
-                    <modifier type="set" field="53e7-91f3-1620-ab04" value="1.0"/>
+                    <modifier type="set" field="e3bb-7676-dcf0-db3b" value="1.0"/>
                   </modifiers>
                 </entryLink>
               </entryLinks>
@@ -3580,18 +3596,60 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
-            <selectionEntry id="aebe-d4c9-e513-cb23" name="Albion Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
+            <selectionEntry id="9df6-837b-fc55-0f95" name="Athelstan Flak Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
+              <modifiers>
+                <modifier type="set" field="hidden" value="true">
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+              </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="76b4-83e8-445d-3bc5" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0887-760c-ee67-0217" type="max"/>
               </constraints>
               <categoryLinks>
-                <categoryLink id="fa64-ea86-0e21-0d99" name="Albion Class" hidden="false" targetId="b6a5-4bf0-cc7d-cef0" primary="false"/>
-                <categoryLink id="d737-309d-ce73-c250" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
+                <categoryLink id="3c1f-e20f-0e16-1de0" name="Athelstan Class" hidden="false" targetId="a4c7-ed2c-6f9a-1a54" primary="false"/>
+                <categoryLink id="ff25-1a70-e521-45ef" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
               </categoryLinks>
               <entryLinks>
-                <entryLink id="8cea-df59-f854-e6fc" name="Albion" hidden="false" collective="false" import="true" targetId="3391-de44-4f50-9776" type="selectionEntry">
+                <entryLink id="f3a6-ba5c-7bcc-012b" name="Athelstan" hidden="false" collective="false" import="true" targetId="dcca-9848-0265-fdcb" type="selectionEntry">
                   <modifiers>
-                    <modifier type="set" field="e3bb-7676-dcf0-db3b" value="1.0"/>
+                    <modifier type="set" field="53e7-91f3-1620-ab04" value="1.0"/>
+                  </modifiers>
+                </entryLink>
+              </entryLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="c7c1-0c37-40e1-012b" name="Hotspur Support Carrier Squadron" hidden="false" collective="false" import="true" type="unit">
+              <modifiers>
+                <modifier type="set" field="hidden" value="true">
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
+                      </conditions>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="99f9-b771-2d06-557d" type="max"/>
+              </constraints>
+              <categoryLinks>
+                <categoryLink id="3de6-5ee5-d5ef-3958" name="New CategoryLink" hidden="false" targetId="d216-bc05-71f1-0fb4" primary="true"/>
+                <categoryLink id="a8ea-abda-4d2b-73c6" name="Hotspur Class" hidden="false" targetId="a683-0b8f-09f3-7880" primary="false"/>
+              </categoryLinks>
+              <entryLinks>
+                <entryLink id="6434-2439-0304-1249" name="Hotspur" hidden="false" collective="false" import="true" targetId="fd72-a8a0-a24d-349e" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="set" field="37b2-91c6-039a-df19" value="1.0"/>
                   </modifiers>
                 </entryLink>
               </entryLinks>
@@ -3602,46 +3660,180 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
             </selectionEntry>
           </selectionEntries>
         </selectionEntryGroup>
+        <selectionEntryGroup id="0347-7500-93da-a246" name="Escort Model" hidden="false" collective="false" import="true">
+          <constraints>
+            <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2e17-0d74-0383-2fd9" type="max"/>
+          </constraints>
+          <entryLinks>
+            <entryLink id="f265-cd7d-7aa7-6e95" name="Escort Token" hidden="false" collective="false" import="true" targetId="9cc1-48f6-f9ea-943f" type="selectionEntry">
+              <categoryLinks>
+                <categoryLink id="48e1-0f9a-a125-d2e6" name="Escort Class" hidden="false" targetId="a8dc-2c16-e614-7894" primary="false"/>
+              </categoryLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="8.0"/>
+              </costs>
+            </entryLink>
+          </entryLinks>
+        </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="47c2-c0ed-d5c8-3e66" name="Sabre" hidden="false" collective="false" import="true" targetId="e34f-b439-2980-93ea" type="selectionEntry"/>
+        <entryLink id="2d3e-87e7-d3c9-7474" name="Windsor" hidden="false" collective="false" import="true" targetId="e47c-54f3-3eb8-82b4" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-  </selectionEntries>
-  <sharedSelectionEntries>
-    <selectionEntry id="3919-a80d-c0f2-d6e6" name="Agincourt" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="model">
+    <selectionEntry id="0ff8-d536-f6d0-8fa7" name="Mycroft Holmes – Minister of the Circus" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="upgrade">
+      <rules>
+        <rule id="80e2-cfc5-b16b-38c3" name="Madame Adrastea, Her Majesty&apos;s Trusted Counsel" publicationId="dbca-8d57-b848-457e" hidden="false">
+          <description>At the end of the Draw Victory &amp; Valour step of the Initiative Phase you may discard a random Victory &amp; Valour card from your opponent&apos;s hand. Your opponent cannot replace the card until the next Round.</description>
+        </rule>
+      </rules>
+      <categoryLinks>
+        <categoryLink id="71a9-311a-8612-e944" name="New CategoryLink" hidden="false" targetId="d6e0-2055-9c1b-5e86" primary="true"/>
+      </categoryLinks>
+      <costs>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="3.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+      </costs>
+    </selectionEntry>
+    <selectionEntry id="eb6a-7a17-e23f-e857" name="Madame Adrastea, Her Majesty&apos;s Trusted Counsel" publicationId="129d-da97-caec-1ddd" hidden="false" collective="false" import="true" type="upgrade">
+      <rules>
+        <rule id="cf10-9e68-4230-8808" name="Madame Adrastea, Her Majesty&apos;s Trusted Counsel" publicationId="dbca-8d57-b848-457e" hidden="false">
+          <description>Once per Round you may replace the Victory Condition on any Victory &amp; Valour Card that has a value in the top left corner of 30 or higher. The replacement text is as follows: “Destroy any Unit this turn and score +1 VP when you do so”.</description>
+        </rule>
+      </rules>
+      <categoryLinks>
+        <categoryLink id="e1af-5b0a-5afb-96ce" name="New CategoryLink" hidden="false" targetId="d6e0-2055-9c1b-5e86" primary="true"/>
+      </categoryLinks>
+      <costs>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="2.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+      </costs>
+    </selectionEntry>
+    <selectionEntry id="ae3e-9ec8-06e5-e085" name="Dublin Heavy Platform" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="model">
       <modifiers>
-        <modifier type="add" field="category" value="60dd-63df-3e4d-1672">
-          <conditions>
-            <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="3858-dafb-248e-5277" type="equalTo"/>
-          </conditions>
-        </modifier>
-        <modifier type="add" field="category" value="ccff-8bb4-a85a-6bbc">
-          <conditions>
-            <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="d140-7b7e-26d3-f36f" type="equalTo"/>
-          </conditions>
+        <modifier type="set" field="hidden" value="true">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="74f8-a93e-d127-d4f7" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="012e-2bdb-8192-e8ca" type="instanceOf"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
-        <modifier type="add" field="category" value="60dd-63df-3e4d-1672">
-          <conditions>
-            <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="3858-dafb-248e-5277" type="equalTo"/>
-          </conditions>
+      </modifiers>
+      <categoryLinks>
+        <categoryLink id="a258-03a8-2fa9-d5b3" name="New CategoryLink" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
+        <categoryLink id="abe8-2f4a-86f5-23d9" name="Irish" hidden="false" targetId="bf1b-5d15-a572-6d42" primary="false"/>
+      </categoryLinks>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="9b45-98c9-e44d-3fee" name="Attached Unit" hidden="false" collective="false" import="true">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="54b8-7f60-83b5-d5d3" type="max"/>
+          </constraints>
+          <selectionEntries>
+            <selectionEntry id="e2dc-5925-b56e-8f7e" name="Ross Battle Platforms" hidden="false" collective="false" import="true" type="unit">
+              <categoryLinks>
+                <categoryLink id="e080-62ef-1c22-19d9" name="Orca Class" hidden="false" targetId="67f5-80e9-aef2-3097" primary="false"/>
+                <categoryLink id="c958-874f-8139-e6b4" name="New CategoryLink" hidden="false" targetId="df3f-7b38-7940-f11e" primary="true"/>
+              </categoryLinks>
+              <entryLinks>
+                <entryLink id="8a75-4f01-72f0-042a" name="Ross" hidden="false" collective="false" import="true" targetId="27d9-943b-1840-698b" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="set" field="151a-cbeb-6cf8-6165" value="1.0"/>
+                  </modifiers>
+                </entryLink>
+              </entryLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
+      <entryLinks>
+        <entryLink id="0897-81e0-3b61-bccd" name="Dublin" hidden="false" collective="false" import="true" targetId="3b72-ee5f-199e-9152" type="selectionEntry"/>
+      </entryLinks>
+      <costs>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+      </costs>
+    </selectionEntry>
+    <selectionEntry id="8e73-38bb-f66d-9ac3" name="Sabre Command Cruisers Squadron" hidden="false" collective="false" import="true" type="unit">
+      <modifiers>
+        <modifier type="set" field="hidden" value="true">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f771-8c4b-877d-735f" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="655a-768e-4dd7-479e" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b54-608f-353d-8628" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="8dbd-7b09-f7db-0eba" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f522-023c-74a9-5412" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="012e-2bdb-8192-e8ca" type="instanceOf"/>
+                <condition field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2239-8cf9-77dd-6673" type="instanceOf"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
         </modifier>
       </modifiers>
+      <categoryLinks>
+        <categoryLink id="a351-2965-51fe-9d73" name="Sabre squadron" hidden="false" targetId="1ed7-e280-a0e5-78b8" primary="false"/>
+        <categoryLink id="9f4b-da8f-3b45-6491" name="British" hidden="false" targetId="fffb-149d-6db1-4439" primary="false"/>
+        <categoryLink id="a603-d06f-013c-c91a" name="Surface Unit" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
+      </categoryLinks>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="2d7c-a888-4c3c-d2bb" name="Escort Model" hidden="false" collective="false" import="true">
+          <constraints>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2732-e167-7e57-7623" type="max"/>
+          </constraints>
+          <entryLinks>
+            <entryLink id="ed87-b310-2cea-f913" name="Escort Token" hidden="false" collective="false" import="true" targetId="9cc1-48f6-f9ea-943f" type="selectionEntry">
+              <constraints>
+                <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f758-a3a0-94e5-8154" type="min"/>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1684-0638-a043-77d4" type="max"/>
+              </constraints>
+              <categoryLinks>
+                <categoryLink id="0525-9210-c82f-48ab" name="Escort Class" hidden="false" targetId="a8dc-2c16-e614-7894" primary="false"/>
+              </categoryLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="8.0"/>
+              </costs>
+            </entryLink>
+          </entryLinks>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
+      <entryLinks>
+        <entryLink id="2783-48f9-c0b2-256e" name="Sabre" hidden="false" collective="false" import="true" targetId="e34f-b439-2980-93ea" type="selectionEntry"/>
+      </entryLinks>
+      <costs>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+      </costs>
+    </selectionEntry>
+  </selectionEntries>
+  <sharedSelectionEntries>
+    <selectionEntry id="3919-a80d-c0f2-d6e6" name="Agincourt" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f4b1-488e-c7de-2c53" type="min"/>
-        <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a1d3-5936-0797-d3d7" type="max"/>
+        <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a1d3-5936-0797-d3d7" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="03b5-a439-a5de-67ab" name="Keep Calm and Carry On*" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
         <infoLink id="749d-6973-c61e-69ff" name="Agincourt" hidden="false" targetId="c4bb-53f6-b701-4255" type="profile"/>
         <infoLink id="6e3a-8bb4-ecb1-0f6d" name="Lionhearted Crew*" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
         <infoLink id="2dfc-1fb1-8331-306c" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="ec2b-b156-4ed1-c159" name="Spotter*" hidden="false" targetId="063a-3229-1f27-a3c2" type="rule"/>
-        <infoLink id="0313-f21d-c42c-ba77" name="Auspicio Regina*" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
+        <infoLink id="ec2b-b156-4ed1-c159" name="Spotter�" hidden="false" targetId="063a-3229-1f27-a3c2" type="rule"/>
+        <infoLink id="0313-f21d-c42c-ba77" name="Auspicio Regina�" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
         <infoLink id="9d90-76e0-ad50-78ed" name="East India Privateers*" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -3667,7 +3859,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                 <infoLink id="20b5-23d5-9d93-72c7" name="Torpedo" hidden="true" targetId="d673-c4da-202e-fbfc" type="rule"/>
               </infoLinks>
               <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="15.0"/>
                 <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
@@ -3720,65 +3912,43 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           </selectionEntries>
         </selectionEntryGroup>
         <selectionEntryGroup id="dafd-e2ed-bb35-803a" name="Secondary Weapon" hidden="false" collective="false" import="true">
-          <modifiers>
-            <modifier type="set" field="50f5-4d9e-c06f-9ff8" value="1.0">
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition field="selections" scope="ancestor" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="61b1-7830-7924-391d" type="instanceOf"/>
-                    <condition field="selections" scope="ancestor" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="60dd-63df-3e4d-1672" type="instanceOf"/>
-                    <condition field="selections" scope="ancestor" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ccff-8bb4-a85a-6bbc" type="instanceOf"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
-            </modifier>
-          </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="50f5-4d9e-c06f-9ff8" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1804-23b8-4eb7-b018" type="max"/>
           </constraints>
           <entryLinks>
-            <entryLink id="5370-44e0-f034-484f" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
+            <entryLink id="5370-44e0-f034-484f" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
-                <modifier type="set" field="cde7-fe32-d94c-48e3" value="1.0">
-                  <conditions>
-                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="61b1-7830-7924-391d" type="instanceOf"/>
-                  </conditions>
-                </modifier>
               </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cde7-fe32-d94c-48e3" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0ec1-b4c6-65b1-68b3" type="max"/>
               </constraints>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
+              </costs>
             </entryLink>
-            <entryLink id="8e2b-d132-01b2-c41d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+            <entryLink id="8e2b-d132-01b2-c41d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
-                <modifier type="set" field="db2d-ad5e-1dfa-e141" value="1.0">
-                  <conditions>
-                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ccff-8bb4-a85a-6bbc" type="instanceOf"/>
-                  </conditions>
-                </modifier>
               </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="db2d-ad5e-1dfa-e141" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="26e5-6e1b-f407-134b" type="max"/>
               </constraints>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="12.0"/>
+              </costs>
             </entryLink>
-            <entryLink id="6624-d0a6-99d3-2037" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="22ed-fcf6-f576-bd3d" type="selectionEntry">
+            <entryLink id="6624-d0a6-99d3-2037" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
-                <modifier type="set" field="cc62-2328-6c18-66d0" value="1.0">
-                  <conditions>
-                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="60dd-63df-3e4d-1672" type="instanceOf"/>
-                  </conditions>
-                </modifier>
               </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cc62-2328-6c18-66d0" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a2e5-4bae-340d-cc48" type="max"/>
               </constraints>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="12.0"/>
+              </costs>
             </entryLink>
           </entryLinks>
         </selectionEntryGroup>
@@ -3788,34 +3958,21 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ca61-70ee-7b88-7ec2" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ac78-f26f-ea3a-d578" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="5a93-07be-59f8-2048" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5db1-cd47-dc73-b9ca" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e034-def1-c11b-4ded" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="94d8-24cb-1753-e353" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="615b-993a-3809-068f" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1f7d-acd3-296f-d2ef" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="6537-0722-0212-eef2" name="Taranis Naval Mortar" hidden="false" collective="false" import="true" targetId="5cc9-461f-b7ef-c0b6" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9362-16fe-6393-27c9" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b9cf-3717-c6b3-f431" type="max"/>
-          </constraints>
+          <modifiers>
+            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+          </modifiers>
         </entryLink>
       </entryLinks>
       <costs>
@@ -3829,13 +3986,13 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e3bb-7676-dcf0-db3b" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="e288-6848-269b-8e66" name="Keep Calm and Carry On*" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
-        <infoLink id="e906-e82c-ea20-bae5" name="Lionhearted Crew*" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="80e4-0961-e696-6a53" name="Reliable Design" hidden="false" targetId="6f17-ddcb-35bc-4e97" type="rule"/>
+        <infoLink id="e288-6848-269b-8e66" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="e906-e82c-ea20-bae5" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="80e4-0961-e696-6a53" name="Reliable Design�" hidden="false" targetId="6f17-ddcb-35bc-4e97" type="rule"/>
         <infoLink id="2bf2-130c-c22d-8ead" name="Albion" hidden="false" targetId="601f-0d50-16b6-b76c" type="profile"/>
-        <infoLink id="8dc5-53e9-842d-0127" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="5b10-6b0b-9aee-74a9" name="Auspicio Regina*" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
-        <infoLink id="1a9c-692a-f202-0053" name="East India Privateers*" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
+        <infoLink id="8dc5-53e9-842d-0127" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="5b10-6b0b-9aee-74a9" name="Auspicio Regina�" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
+        <infoLink id="1a9c-692a-f202-0053" name="East India Privateers�" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="87b9-3d07-46f4-d5cb" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -3865,16 +4022,25 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="998f-e792-3faf-b6a1" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="fdec-b5a9-c680-2649" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ddb6-5c91-8751-b607" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="6d8b-3210-c49b-49b4" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5faf-67ff-ed12-3838" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -3883,6 +4049,9 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dd2e-464e-06a2-c07d" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -3906,11 +4075,17 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="168a-160f-90b2-203e" type="min"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="ee07-c3da-8ca5-5224" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="93ea-59aa-1ba5-cc5f" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -3919,11 +4094,17 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f3be-809e-e012-f60d" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="04bb-28ef-d417-2674" name="Majestic Gun Battery" hidden="false" collective="false" import="true" targetId="2f2f-2489-8fb4-fe19" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bfc1-93b6-dab1-9513" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -4008,69 +4189,36 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="69c1-e949-ea1b-d13e" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5cc9-1a7e-c602-137f" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="ed05-80c9-fe34-8269" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4680-9ab9-c8c2-352f" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1600-0288-93e5-5d70" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="2730-012c-3835-3a58" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="913a-5900-acc7-ee4a" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c9fa-9cb6-cca7-3f51" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="d25f-bbaa-d4a9-97b1" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1cb0-506e-16fd-abd5" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="218e-2ccf-5ed8-89a6" type="min"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="105.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="101.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="dcca-9848-0265-fdcb" name="Athelstan" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="model">
-      <modifiers>
-        <modifier type="add" field="category" value="ccff-8bb4-a85a-6bbc">
-          <conditions>
-            <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="d140-7b7e-26d3-f36f" type="equalTo"/>
-          </conditions>
-        </modifier>
-        <modifier type="add" field="category" value="61b1-7830-7924-391d">
-          <conditions>
-            <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="9588-2849-b229-49e8" type="equalTo"/>
-          </conditions>
-        </modifier>
-        <modifier type="add" field="category" value="60dd-63df-3e4d-1672">
-          <conditions>
-            <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="3858-dafb-248e-5277" type="equalTo"/>
-          </conditions>
-        </modifier>
-      </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="90db-eb31-b8ed-8b6d" type="min"/>
         <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="53e7-91f3-1620-ab04" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="ea64-5e38-d7d0-ce62" name="Athelstan" hidden="false" targetId="3cfa-aca1-05c5-88e3" type="profile"/>
-        <infoLink id="ad17-3055-c92c-292a" name="Sharpnel" hidden="false" targetId="806d-f937-7b54-eae9" type="rule"/>
+        <infoLink id="ad17-3055-c92c-292a" name="Shrapnel�" hidden="false" targetId="806d-f937-7b54-eae9" type="rule"/>
         <infoLink id="9bf5-1413-390e-c33c" name="Flak Barrage�" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
             <modifier type="append" field="name" value=" (10)"/>
@@ -4088,65 +4236,43 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="90ed-2032-e16c-38d3" name="Secondary Weapon" hidden="false" collective="false" import="true">
-          <modifiers>
-            <modifier type="set" field="21f9-7588-5615-bfba" value="1.0">
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition field="selections" scope="ancestor" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="61b1-7830-7924-391d" type="instanceOf"/>
-                    <condition field="selections" scope="ancestor" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ccff-8bb4-a85a-6bbc" type="instanceOf"/>
-                    <condition field="selections" scope="ancestor" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="60dd-63df-3e4d-1672" type="instanceOf"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
-            </modifier>
-          </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="21f9-7588-5615-bfba" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6008-4f8d-4f92-fcbb" type="max"/>
           </constraints>
           <entryLinks>
-            <entryLink id="2661-7154-300d-5f51" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
+            <entryLink id="2661-7154-300d-5f51" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
-                <modifier type="set" field="48da-cc70-46d0-8cb6" value="1.0">
-                  <conditions>
-                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="61b1-7830-7924-391d" type="instanceOf"/>
-                  </conditions>
-                </modifier>
               </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="48da-cc70-46d0-8cb6" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="084d-63d3-0402-3b76" type="max"/>
               </constraints>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
+              </costs>
             </entryLink>
-            <entryLink id="6e1b-0356-8122-7f1b" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+            <entryLink id="6e1b-0356-8122-7f1b" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
-                <modifier type="set" field="e572-3286-4cf4-e55d" value="1.0">
-                  <conditions>
-                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ccff-8bb4-a85a-6bbc" type="instanceOf"/>
-                  </conditions>
-                </modifier>
               </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e572-3286-4cf4-e55d" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7a9d-0fab-8b00-dc96" type="max"/>
               </constraints>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="12.0"/>
+              </costs>
             </entryLink>
-            <entryLink id="4202-d517-56fa-42df" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="22ed-fcf6-f576-bd3d" type="selectionEntry">
+            <entryLink id="4202-d517-56fa-42df" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
               <modifiers>
                 <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
-                <modifier type="set" field="d765-8355-676b-c35d" value="1.0">
-                  <conditions>
-                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="60dd-63df-3e4d-1672" type="instanceOf"/>
-                  </conditions>
-                </modifier>
               </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d765-8355-676b-c35d" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8db1-7178-4607-6afd" type="max"/>
               </constraints>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="12.0"/>
+              </costs>
             </entryLink>
           </entryLinks>
         </selectionEntryGroup>
@@ -4156,64 +4282,36 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f9c6-a657-ce78-7edd" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="23ca-cb16-23d6-7196" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="8638-a8d5-ca80-9d32" name="Fragmentation Launcher" hidden="false" collective="false" import="true" targetId="14bf-2c72-5ac3-29f7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="81a2-9821-9ff6-1af3" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="74d8-a95f-9b9c-ff3f" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="466c-d1dd-befa-1a83" name="Fragmentation Launcher" hidden="false" collective="false" import="true" targetId="14bf-2c72-5ac3-29f7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="44d4-d792-4563-fc98" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d4cc-5f62-9e26-7250" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="3ce2-3384-8deb-d801" name="Fragmentation Launcher" hidden="false" collective="false" import="true" targetId="14bf-2c72-5ac3-29f7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8f42-da5e-e122-4b64" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a01c-a53f-14c3-07b4" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="c930-0b78-b772-1084" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="00db-fcc0-448a-a8cb" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5577-a750-eb83-08cf" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="ef16-dd14-eefd-7626" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4654-1ce3-7143-4160" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e5ca-ca0c-33d2-ea26" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="5e21-87c7-0e7a-8c67" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="30d1-83da-eb33-46e4" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3633-78da-1fa5-a0ad" type="min"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -4228,11 +4326,11 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       </constraints>
       <infoLinks>
         <infoLink id="dd9a-d3b8-6c91-8856" name="Bonaventure" hidden="false" targetId="836a-e8ad-8cc4-1481" type="profile"/>
-        <infoLink id="dd19-9cff-4983-957f" name="Ablative Prow Armour" hidden="false" targetId="2823-33a9-a62b-e29a" type="rule"/>
-        <infoLink id="a79f-7bc3-36e6-cc49" name="Loyal She Began; Thus She Remains" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
-        <infoLink id="0d7d-3887-1367-6721" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="68e8-7a69-c559-96e3" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="44df-ea8d-db48-ca28" name="Vulnerable Stern" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="dd19-9cff-4983-957f" name="Ablative Prow Armour�" hidden="false" targetId="2823-33a9-a62b-e29a" type="rule"/>
+        <infoLink id="a79f-7bc3-36e6-cc49" name="Loyal She Began; Thus She Remains�" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
+        <infoLink id="0d7d-3887-1367-6721" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="68e8-7a69-c559-96e3" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="44df-ea8d-db48-ca28" name="Vulnerable Stern�" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="af1c-464a-2723-5d38" name="Strike Cruiser" hidden="false" targetId="ec0f-66dd-f28e-e778" primary="false"/>
@@ -4255,23 +4353,32 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
               </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4c3b-2381-334e-36e9" type="min"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4523-aa06-2306-c203" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4523-aa06-2306-c203" type="max"/>
               </constraints>
               <entryLinks>
                 <entryLink id="0fd8-10ac-0395-d125" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="419e-fc79-3d9e-8e15" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="31e2-bae2-7575-ae25" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3a8b-0852-6f4a-492d" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="0462-1601-4490-c2de" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0105-2b05-00dd-7a4f" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -4295,16 +4402,25 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ab7c-b0c8-70e8-f0f5" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="d7d8-a522-0a4c-b157" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e07f-b833-81bc-46d2" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="ff1a-0544-c18e-4ab7" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="893f-3b83-f8cf-48ea" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -4385,6 +4501,9 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
               <modifiers>
                 <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
               </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="df04-bc37-9a30-8271" type="max"/>
+              </constraints>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
               </costs>
@@ -4393,13 +4512,16 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
               <modifiers>
                 <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
               </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="59e0-a781-ec3e-48ff" type="max"/>
+              </constraints>
             </entryLink>
             <entryLink id="a5db-8437-2f95-9548" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
               <modifiers>
                 <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
               </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="df81-70fc-1663-8a3e" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b7f9-df1f-124c-8882" type="max"/>
               </constraints>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7.0"/>
@@ -4413,28 +4535,16 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8574-2f6d-b0c7-55ef" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3382-7c9d-91cb-9402" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="3786-ad73-1d7e-e6c7" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7661-5459-fdff-b31b" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="09e4-d8ba-fc6d-3fde" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="b57c-78ed-0b1a-ad3f" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cb0c-a720-e32b-310a" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e55a-62c8-4e3a-1a7e" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -4492,7 +4602,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
-                <entryLink id="e1a7-80b6-ac5f-4b73" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="e1a7-80b6-ac5f-4b73" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -4528,7 +4638,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
                 </entryLink>
-                <entryLink id="ef81-aa31-2f04-6500" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="ef81-aa31-2f04-6500" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
@@ -4567,7 +4677,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="41b4-38ec-a15f-7ff9" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="b303-87c3-f264-6b17" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry">
@@ -4575,7 +4685,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="55ad-b29b-e206-3885" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="b3be-ae95-9ea4-6f09" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry">
@@ -4583,7 +4693,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1b54-ea87-f8d1-5a52" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="e8e6-5208-f349-1a9b" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
@@ -4595,7 +4705,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4784-b712-87b8-18c9" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="36d6-b052-dc6e-7be2" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
@@ -4603,7 +4713,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="aa5b-4e3a-a3f0-af08" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="7528-6be3-0dad-bddf" name="Trident generator" hidden="false" collective="false" import="true" targetId="4f9f-bf12-daca-15ed" type="selectionEntry">
@@ -4611,7 +4721,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2485-1290-fc51-b987" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
               </entryLinks>
@@ -4642,7 +4752,7 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
-                <entryLink id="9db7-04e5-f806-5c97" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="9db7-04e5-f806-5c97" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -4668,37 +4778,21 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6e42-e97b-948f-55ff" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="be26-ba42-856e-6b95" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="f461-f7cf-cf78-3466" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="110e-749a-0199-27be" type="selectionEntry">
+        <entryLink id="f461-f7cf-cf78-3466" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="271d-e3e9-0351-1a56" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0468-c5c0-610a-57f9" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="5913-8cb0-35e0-75c1" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a89b-2f58-3be5-5b8b" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f779-14b6-32ab-e12a" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="0a98-be3a-b4c9-c357" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="0a98-be3a-b4c9-c357" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5935-bcd7-b498-5f40"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4488-99d7-982d-99fc" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3ad3-09e1-8eb4-aadb" type="min"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -4709,18 +4803,18 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
     <selectionEntry id="9482-5ed0-b7b8-e060" name="Caliburn" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5b61-bdab-1f3e-8c56" type="min"/>
-        <constraint field="selections" scope="parent" value="6.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6e99-b1f4-4a22-0885" type="max"/>
+        <constraint field="selections" scope="parent" value="7.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6e99-b1f4-4a22-0885" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="56d5-873d-b8df-45e0" name="Caliburn" hidden="false" targetId="40c5-de80-7148-acd1" type="profile"/>
         <infoLink id="8f81-94a6-d1f1-ba76" name="Auxiliary Mine Layer�" hidden="false" targetId="6158-153b-d320-6060" type="rule"/>
-        <infoLink id="35e0-fd18-60c0-cdfe" name="Focused Gunnery" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
-        <infoLink id="3f5c-812a-f5a8-32f5" name="Linear Dash" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
-        <infoLink id="b3fb-2336-e32f-c8ee" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="419f-c522-0d45-6349" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="b642-e5e3-dacb-905f" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="35e0-fd18-60c0-cdfe" name="Focused Gunnery�" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
+        <infoLink id="3f5c-812a-f5a8-32f5" name="Linear Dash�" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
+        <infoLink id="b3fb-2336-e32f-c8ee" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="419f-c522-0d45-6349" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="b642-e5e3-dacb-905f" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
         <infoLink id="9731-a234-98ec-06e8" name="Auspicio Regina*" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
-        <infoLink id="ab3f-034a-dae8-07ae" name="East India Privateers" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
+        <infoLink id="ab3f-034a-dae8-07ae" name="East India Privateers�" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="405d-9937-f5e1-9744" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -4771,10 +4865,6 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9485-4578-868c-dd60" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1ff2-0ab5-85d1-ecd8" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -4789,13 +4879,13 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       </constraints>
       <infoLinks>
         <infoLink id="327f-e25a-d458-cc9c" name="Excalibur" hidden="false" targetId="e977-1226-3a79-1a0d" type="profile"/>
-        <infoLink id="8120-baa1-fc1b-94fc" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
-        <infoLink id="4578-22c4-43e2-34b1" name="Giant Slayer" hidden="false" targetId="0d99-00ae-4c22-20b7" type="rule"/>
-        <infoLink id="b4f0-d44c-8342-ec91" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="8fe1-33f2-d157-58f8" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="2dc9-05a0-00fd-f173" name="Vanguard*" hidden="false" targetId="f721-8318-3875-0140" type="rule"/>
-        <infoLink id="c351-d868-f872-f9fc" name="Auspicio Regina" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
-        <infoLink id="6260-3998-8baa-2bc9" name="East India Privateers" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
+        <infoLink id="8120-baa1-fc1b-94fc" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="4578-22c4-43e2-34b1" name="Giant Slayer�" hidden="false" targetId="0d99-00ae-4c22-20b7" type="rule"/>
+        <infoLink id="b4f0-d44c-8342-ec91" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="8fe1-33f2-d157-58f8" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="2dc9-05a0-00fd-f173" name="Vanguard�" hidden="false" targetId="f721-8318-3875-0140" type="rule"/>
+        <infoLink id="c351-d868-f872-f9fc" name="Auspicio Regina�" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
+        <infoLink id="6260-3998-8baa-2bc9" name="East India Privateers�" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="c9d5-5708-75c6-49b9" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -4892,19 +4982,11 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6d85-8ac5-32b8-094f" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8f3d-32b8-098a-3322" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="1ec2-0cba-f177-830b" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a76c-7fed-ad5b-207c" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1e57-a701-9076-43b5" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -5085,41 +5167,25 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="f10b-2c4e-5da4-121a" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="f10b-2c4e-5da4-121a" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ef30-90eb-ac1e-1b57" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1120-f8fb-1b92-57d2" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="8ed3-8110-fead-1a63" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="edf1-42ff-83e3-f68b" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="483f-9265-c5d9-e5af" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="bec9-4fe5-90e6-2e36" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9f7b-e20a-2f62-ee16" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7fb5-4899-0115-f31e" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="9995-1b63-4a70-3968" name="Prow Ram" hidden="false" collective="false" import="true" targetId="b9d2-4d96-fe6c-c015" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fbbc-232e-41de-e8cf" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f4af-6360-4ef1-6f44" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -5134,13 +5200,13 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
       </constraints>
       <infoLinks>
         <infoLink id="cfaa-3a30-d317-5721" name="Yukon" hidden="false" targetId="30c1-b306-afed-4c4e" type="profile"/>
-        <infoLink id="00d8-0877-afdf-8a50" name="Ablative Prow Armour" hidden="false" targetId="2823-33a9-a62b-e29a" type="rule"/>
-        <infoLink id="fe6c-59d8-ad74-f190" name="Loyal She Began; Thus She Remains" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
-        <infoLink id="29aa-7d6b-2aec-12d8" name="Lionhearted Crew*" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="397a-99a1-c0fc-0578" name="Mine Layer*" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
-        <infoLink id="92bf-e4b5-7e02-c8e5" name="Mine Sweeper*" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
-        <infoLink id="589c-5a0b-f807-3f76" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="2bc9-3a74-6455-e40a" name="Vulnerable Stern*" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="00d8-0877-afdf-8a50" name="Ablative Prow Armour�" hidden="false" targetId="2823-33a9-a62b-e29a" type="rule"/>
+        <infoLink id="fe6c-59d8-ad74-f190" name="Loyal She Began; Thus She Remains�" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
+        <infoLink id="29aa-7d6b-2aec-12d8" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="397a-99a1-c0fc-0578" name="Mine Layer�" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
+        <infoLink id="92bf-e4b5-7e02-c8e5" name="Mine Sweeper�" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
+        <infoLink id="589c-5a0b-f807-3f76" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="2bc9-3a74-6455-e40a" name="Vulnerable Stern�" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="9ed0-cbfb-d7da-5986" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -5170,16 +5236,25 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d3f1-523a-f879-761e" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="3cde-72ee-b76c-b0b3" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4537-b415-c347-1210" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="ae00-4b65-48c2-8a6a" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1d5a-e922-a5ae-f4a8" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -5203,16 +5278,25 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2096-e414-e66c-5e8f" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="557e-8c4c-ca86-0fbe" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="76bf-240a-fdec-a5c8" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="c30a-e7fe-7413-c1d6" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="20ea-3cbf-d532-79a9" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -5285,36 +5369,24 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="04fb-e478-2687-1503" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="04fb-e478-2687-1503" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d300-ace2-f148-2855" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="00ed-12d8-5370-36e1" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="a1c8-4035-0181-82c2" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2bcd-d4e8-ad5a-5eee" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="452f-9b18-e6df-0ed0" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="a061-f5a7-16a5-129f" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="93bd-4432-ee13-8603" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a4ad-ab4c-4023-d317" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="138.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="131.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -5328,10 +5400,10 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <infoLink id="7dd9-a4bd-384a-ad83" name="Combat Air Patrol�" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
         <infoLink id="1574-4ca9-4bba-6bad" name="Full Steam Ahead�" hidden="false" targetId="9111-7f5e-6eac-7cbe" type="rule"/>
         <infoLink id="6632-9de2-2c26-bf17" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="ab84-5582-a10e-9239" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="456f-fe23-d767-f779" name="SRS Mine Clearance" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
-        <infoLink id="40ed-da34-92ff-ff34" name="SRS Recon Flight*" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
-        <infoLink id="e60d-64e5-8827-99b4" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="ab84-5582-a10e-9239" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="456f-fe23-d767-f779" name="SRS Mine Clearance�" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
+        <infoLink id="40ed-da34-92ff-ff34" name="SRS Recon�" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
+        <infoLink id="e60d-64e5-8827-99b4" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
         <infoLink id="b592-8bdb-569a-2a4b" name="Auspicio Regina�" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
         <infoLink id="d1c1-eabe-d50a-4d91" name="East India Privateers�" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
       </infoLinks>
@@ -5343,10 +5415,6 @@ Review 3.03.07: correction suggested in discord (ORBAT 3.03 released the 2023-02
         <selectionEntry id="8442-c309-d3a6-74b7" name="SRS" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="true" import="true" type="upgrade">
           <comment>No. 1 Squadron
 A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts to take the elite Defiant fighter squadron, the No. 1 Squadron. Their motto, In omnibus princeps (&quot;First in all things&quot;) reflects the squadron&apos;s status as the RFC’s oldest unit. Designers note: It is recommended that you paint or otherwise mark the No 1 Squadron SRS tokens differently to your other SRS Tokens. NUMBER ONE SQUADRON SRS: SRS Tokens launched by Units with this rule are called Number One Squadron�</comment>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2564-5eb2-fc42-6335" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="326a-c15b-24bc-7257" type="max"/>
-          </constraints>
           <infoLinks>
             <infoLink id="f96c-9580-2938-18ce" name="SRS" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="b5a8-5584-f221-f445" type="profile">
               <modifiers>
@@ -5365,28 +5433,16 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5bb8-4b5a-e3af-218c" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8964-af30-a321-96bd" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="92d9-0d6b-6a0f-cedd" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ad13-681a-9fd9-6cdd" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9362-a7fb-8892-ef63" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="e707-e574-f588-2dcd" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6439-7790-f215-39c6" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c037-6206-20d6-7e20" type="min"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -5422,23 +5478,32 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
             <selectionEntryGroup id="7bfd-2b1d-573c-a854" name="Front First" hidden="false" collective="false" import="true" defaultSelectionEntryId="d2c9-0af9-401f-9bcd">
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="200d-63a4-ec92-716e" type="min"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="28e4-4d92-f42c-fa43" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="28e4-4d92-f42c-fa43" type="max"/>
               </constraints>
               <entryLinks>
                 <entryLink id="d2c9-0af9-401f-9bcd" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e690-c66c-b4e9-d29b" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="444c-3b2e-9276-5b5c" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4ad4-a7b7-b611-18a3" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="a799-39d1-3c1a-5747" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c31b-afad-7718-2d57" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -5455,16 +5520,25 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="384d-cf6e-3d76-f7dc" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="dc04-9ee3-ecf2-e80a" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a3a7-8a6b-d0a3-c089" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="c861-deb2-735b-96d9" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0bd1-db42-03b0-1ab9" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -5479,28 +5553,16 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b122-78d7-1c79-0193" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4e36-a247-5e66-de82" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="fdd9-e39c-0cf7-6853" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4af8-71ad-1d5f-37aa" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="55a9-a083-6869-17f3" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="5646-d848-d475-f541" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="939c-8770-494a-781e" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f82e-844b-0170-7e06" type="min"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -5515,11 +5577,11 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="8bde-6014-9a3e-37d3" name="Morgana" hidden="false" targetId="d804-ed50-9392-66d9" type="profile"/>
-        <infoLink id="67e7-a4a8-60e1-ad06" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="866b-6db0-8abc-24e1" name="Full Steam Ahead" hidden="false" targetId="9111-7f5e-6eac-7cbe" type="rule"/>
-        <infoLink id="2360-3f07-abc3-0718" name="Giant Slayer" hidden="false" targetId="0d99-00ae-4c22-20b7" type="rule"/>
+        <infoLink id="67e7-a4a8-60e1-ad06" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="866b-6db0-8abc-24e1" name="Full Steam Ahead�" hidden="false" targetId="9111-7f5e-6eac-7cbe" type="rule"/>
+        <infoLink id="2360-3f07-abc3-0718" name="Giant Slayer�" hidden="false" targetId="0d99-00ae-4c22-20b7" type="rule"/>
         <infoLink id="2fcc-45a3-3c57-e8e2" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="02a8-590f-233f-54f9" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="02a8-590f-233f-54f9" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
         <infoLink id="71f8-0a3e-1a46-d4b8" name="Terror From Belove�" hidden="false" targetId="405a-6e4d-45ad-b188" type="rule"/>
         <infoLink id="4979-f091-1de9-3cef" name="Silent Hunter�" hidden="false" targetId="4073-0c13-d827-7ab1" type="rule"/>
       </infoLinks>
@@ -5532,28 +5594,16 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="383c-a396-701a-2c1c" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c7cb-fe95-25a4-5e7b" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="c569-3bb5-d3c0-3bfb" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ac48-fa9f-a0cb-56c6" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b32a-a0de-c4cf-bf78" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="6163-f772-6401-5a3d" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5888-87ac-f851-165d"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="91b4-ea92-09bc-fba8" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f79f-bd8f-afa1-d40b" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -5567,13 +5617,13 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="690b-ffa0-0a94-27dc" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="1da0-cd6b-1659-8c65" name="Hammer Sweep" hidden="false" targetId="4a79-7f9b-ba17-59b8" type="rule"/>
-        <infoLink id="7b49-c049-7c78-834c" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="0a06-811f-f277-f3f2" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="1da0-cd6b-1659-8c65" name="Hammer Sweep�" hidden="false" targetId="4a79-7f9b-ba17-59b8" type="rule"/>
+        <infoLink id="7b49-c049-7c78-834c" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="0a06-811f-f277-f3f2" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
         <infoLink id="846d-8cb5-9dce-b3b5" name="Lancelot" hidden="false" targetId="8f62-3f08-75e7-4a8b" type="profile"/>
-        <infoLink id="ab33-a838-2825-14a6" name="Reliable Design" hidden="false" targetId="6f17-ddcb-35bc-4e97" type="rule"/>
-        <infoLink id="5884-69c6-f84f-d3c4" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="5bfc-996d-219a-dfcc" name="Auspicio Regina" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
+        <infoLink id="ab33-a838-2825-14a6" name="Reliable Design�" hidden="false" targetId="6f17-ddcb-35bc-4e97" type="rule"/>
+        <infoLink id="5884-69c6-f84f-d3c4" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="5bfc-996d-219a-dfcc" name="Auspicio Regina�" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
         <infoLink id="6d35-0351-ef75-2f94" name="East India Privateers" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -5604,16 +5654,25 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7d90-a252-2735-3b89" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="3dac-528d-be34-4afe" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="34eb-1ab1-abe5-07dd" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="3699-f1e3-b586-9765" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5ef4-3cb2-6a7b-3f4f" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -5622,6 +5681,9 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2ebe-85c6-c021-dc88" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -5645,11 +5707,17 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="494d-ad98-8e4f-a836" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="fb82-9d54-0fd1-8030" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b6fb-78d5-96d2-75c5" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -5658,11 +5726,17 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3369-7490-4fc4-5396" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="4101-9e9b-84d0-0f19" name="Majestic Gun Battery" hidden="false" collective="false" import="true" targetId="2f2f-2489-8fb4-fe19" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="398f-2af3-96d1-52d2" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -5736,7 +5810,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <selectionEntryGroup id="3b9b-d04e-1699-ac2f" name="Secondary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="107a-cca0-0e1e-a574">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8da8-47fd-56e8-ee42" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8fb6-01e3-35aa-1f16" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8fb6-01e3-35aa-1f16" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="107a-cca0-0e1e-a574" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
@@ -5777,34 +5851,21 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3ce6-34bd-d7c4-8b11" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3adf-fb9c-45d9-8a17" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="bc23-1007-4e9b-9ffd" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a26c-6856-6f9f-2a79" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4152-179d-b786-0d3f" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="8358-af6c-ea21-0b52" name="Prow Ram" hidden="false" collective="false" import="true" targetId="b9d2-4d96-fe6c-c015" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bb55-0cff-f68c-fe42" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0896-ab56-e2ec-76f7" type="max"/>
-          </constraints>
+          <modifiers>
+            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+          </modifiers>
         </entryLink>
-        <entryLink id="3654-c5f1-e308-a9a7" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="3654-c5f1-e308-a9a7" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="75db-3209-671b-e2cb" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6ecc-abfe-062e-6d4d" type="min"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -5861,7 +5922,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
-                <entryLink id="ed64-09a6-2170-adc2" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="ed64-09a6-2170-adc2" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -5897,7 +5958,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
                 </entryLink>
-                <entryLink id="74bd-590d-654d-6da0" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="74bd-590d-654d-6da0" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
@@ -5936,7 +5997,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cecb-29a2-f923-6f67" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="756a-880d-f7de-e427" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry">
@@ -5944,7 +6005,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d0a8-81d2-ab2a-d3bb" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="ae3a-c2ca-7417-9209" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry">
@@ -5952,7 +6013,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="10eb-dca7-17bb-7659" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="4092-1129-e5fa-f64e" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
@@ -5964,7 +6025,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b299-d6f5-20ac-2bd1" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="64dc-dedb-649e-6207" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
@@ -5972,7 +6033,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e835-8384-c8db-420d" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="ae14-b215-623d-c75e" name="Trident generator" hidden="false" collective="false" import="true" targetId="4f9f-bf12-daca-15ed" type="selectionEntry">
@@ -5980,60 +6041,81 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4a67-0ca3-10b5-4bd4" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
+        <selectionEntryGroup id="99f8-7eaa-fafa-4fff" name="Secondary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="16a0-9e6b-0673-281c">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6d80-9454-13e9-9d49" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="de70-b27c-05ce-815a" type="max"/>
+          </constraints>
+          <entryLinks>
+            <entryLink id="16a0-9e6b-0673-281c" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8aac-79c4-1d8b-3916" type="max"/>
+              </constraints>
+            </entryLink>
+            <entryLink id="2413-e6ec-89eb-fc2e" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e3fb-f057-1a07-febf" type="max"/>
+              </constraints>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+              </costs>
+            </entryLink>
+            <entryLink id="a8be-7216-e21e-63e6" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4953-87b1-797b-cbf0" type="max"/>
+              </constraints>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+              </costs>
+            </entryLink>
+          </entryLinks>
+        </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
         <entryLink id="fe2c-8756-de35-ccdb" name="Prow Ram" hidden="false" collective="false" import="true" targetId="b9d2-4d96-fe6c-c015" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cf9b-a348-0afe-56b1" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c9b0-6141-88d0-99cb" type="max"/>
-          </constraints>
+          <modifiers>
+            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+          </modifiers>
         </entryLink>
-        <entryLink id="7529-c807-005a-5f04" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+        <entryLink id="7529-c807-005a-5f04" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4042-3f00-b9bc-a89f" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dc85-be3f-87aa-0a70" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="23e8-237a-6981-5e19" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0d6a-56ec-e788-7ac9" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f8ee-955a-954e-d15a" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="b5ba-0ae8-1b19-718a" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4c07-b1c3-b78a-08d9" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="818f-e811-19e9-8278" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="e085-7612-7a58-973b" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="e085-7612-7a58-973b" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="60bc-58a8-db97-7f33" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b1ac-e92a-c892-22c1" type="min"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="150.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="140.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -6044,16 +6126,15 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="0373-7ae0-0f7d-ac8b" name="Protecteur" hidden="false" targetId="ced3-c53b-ff9b-fe92" type="profile"/>
-        <infoLink id="0aaa-0d57-dded-e243" name="Loyal She Began; Thus She Remains" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
-        <infoLink id="b9dc-1b56-e1a8-5829" name="Combat Air Patrol" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
-        <infoLink id="4b74-1dd5-044c-6f40" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="d1f0-9acf-c026-3b07" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="ffaa-eb5c-aabb-394b" name="SRS Mine Clearance" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
-        <infoLink id="2e6c-fc9d-f527-a135" name="SRS Recon Flight" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
-        <infoLink id="aecd-6426-ecef-c2b2" name="Heavy Firepower" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="6a0d-56d1-5cac-e67f" name="Mine Layer" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
-        <infoLink id="68a0-0e98-c99c-40b5" name="Vulnerable Stern" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
-        <infoLink id="55c7-4b9b-e8b6-9a9f" name="Unexpected Arrival" hidden="false" targetId="f4aa-042e-34e5-1938" type="rule"/>
+        <infoLink id="0aaa-0d57-dded-e243" name="Loyal She Began; Thus She Remains�" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
+        <infoLink id="b9dc-1b56-e1a8-5829" name="Combat Air Patrol�" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
+        <infoLink id="4b74-1dd5-044c-6f40" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="d1f0-9acf-c026-3b07" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="ffaa-eb5c-aabb-394b" name="SRS Mine Clearance�" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
+        <infoLink id="2e6c-fc9d-f527-a135" name="SRS Recon�" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
+        <infoLink id="aecd-6426-ecef-c2b2" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="68a0-0e98-c99c-40b5" name="Vulnerable Stern�" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="55c7-4b9b-e8b6-9a9f" name="Unexpected Arrival�" hidden="false" targetId="f4aa-042e-34e5-1938" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="053d-a666-3d7c-aee1" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -6081,50 +6162,30 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         </selectionEntry>
       </selectionEntries>
       <entryLinks>
-        <entryLink id="bb66-fe65-93c4-951f" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="bb66-fe65-93c4-951f" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="8901-cc02-f55e-2ee5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0363-9d0f-d962-6865" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fb46-c235-0726-4519" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="52ed-cbdc-bf78-faca" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9eb8-78b3-27eb-1128" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="efcd-9330-4554-028b" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="0ee3-4b0c-bfa2-ca7b" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="967d-b6fd-f2e1-0429" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="965d-8143-24a3-fdd7" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="b061-e5fe-ac80-7446" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="447f-271c-02e7-53b0" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ded0-2f15-561f-3c45" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="9d80-cd8e-4968-5cc3" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2d9f-504c-611e-e16b" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a324-0308-cf61-fdc3" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -6138,10 +6199,10 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <constraint field="selections" scope="parent" value="6.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b57b-42bb-1c6b-6067" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="da03-b94f-4957-f4e1" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="d171-c869-2fd4-ecf6" name="Loyal She Began; Thus She Remains" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
-        <infoLink id="1ccb-a0d6-285c-8764" name="Pack Hunter" hidden="false" targetId="112e-82cb-42a3-83d2" type="rule"/>
-        <infoLink id="28a1-8383-20ec-2f9c" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="da03-b94f-4957-f4e1" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="d171-c869-2fd4-ecf6" name="Loyal She Began; Thus She Remains�" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
+        <infoLink id="1ccb-a0d6-285c-8764" name="Pack Hunter�" hidden="false" targetId="112e-82cb-42a3-83d2" type="rule"/>
+        <infoLink id="28a1-8383-20ec-2f9c" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
         <infoLink id="a011-b639-40df-8049" name="Orca" hidden="false" targetId="36d3-f255-efd1-0807" type="profile"/>
       </infoLinks>
       <categoryLinks>
@@ -6153,10 +6214,6 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bb7b-2aa1-3e45-328e" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c0ab-96f0-82ec-ccd8" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -6193,28 +6250,16 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1c97-bfce-6e81-6541" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="06e9-cee7-5def-bf0a" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="37a2-6600-14ec-7f1c" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5888-87ac-f851-165d"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7be4-97b5-8110-8c33" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4b98-9bca-00df-a1b0" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="1889-0fd3-667f-c621" name="Vengeance Keel Saw" hidden="false" collective="false" import="true" targetId="5fe7-329e-4129-b89e" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6c8d-c070-d2f2-1767" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5681-cf57-4211-6d34" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -6228,12 +6273,12 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5ae8-12fc-4300-1d42" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="43b2-017e-360e-ce6a" name="Ablative Prow Armour" hidden="false" targetId="2823-33a9-a62b-e29a" type="rule"/>
+        <infoLink id="43b2-017e-360e-ce6a" name="Ablative Prow Armour�" hidden="false" targetId="2823-33a9-a62b-e29a" type="rule"/>
         <infoLink id="bf54-158b-bea3-4a8d" name="Newfoundland" hidden="false" targetId="841c-c422-2f0a-6a19" type="profile"/>
-        <infoLink id="11a3-f2af-1e54-86ac" name="Loyal She Began; Thus She Remains" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
-        <infoLink id="35b4-1230-d980-d206" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="4449-43eb-9ca1-c9c5" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="d2d2-d34e-4178-8fd5" name="Vulnerable Stern" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="11a3-f2af-1e54-86ac" name="Loyal She Began; Thus She Remains�" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
+        <infoLink id="35b4-1230-d980-d206" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="4449-43eb-9ca1-c9c5" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="d2d2-d34e-4178-8fd5" name="Vulnerable Stern�" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="7df7-6920-ff08-51cd" name="Crown�" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -6263,16 +6308,25 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="77d5-fd56-b036-ea58" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="231f-a5de-e375-5e56" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b151-3cdd-b596-22d3" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="73cd-0f09-c760-02e6" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3f09-0494-7257-7312" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -6296,16 +6350,25 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="414f-0ac4-02ed-a142" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="1090-7e45-ee13-cd93" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="92d3-54d2-104f-9143" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="0ff5-d338-302a-a2d1" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="521f-6c0e-1afa-fd88" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -6378,32 +6441,20 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="e673-5eda-4c90-cd61" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="e673-5eda-4c90-cd61" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8366-6bed-7801-e2eb" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4437-ef85-a95d-125b" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="d20f-ceac-ccb4-c8ed" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f6a5-5708-b931-4533" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c117-d439-0f6c-b6a3" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="d79a-5ca0-9bbc-4eda" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1ae8-c0b1-2eb0-efc3" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b7da-ee63-0815-3fa5" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -6418,12 +6469,13 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="e0cf-64c8-2562-1782" name="Bedivere" hidden="false" targetId="9a89-b5c4-303a-87e9" type="profile"/>
-        <infoLink id="f940-d224-aae4-0cc6" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
-        <infoLink id="c711-273f-b29d-ceda" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="df14-ec8f-b14d-4a8c" name="Skyfire*" hidden="false" targetId="1083-2af1-7bfc-7a55" type="rule"/>
-        <infoLink id="644c-7384-242c-ffa2" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="4a00-231c-141a-823b" name="Auspicio Regina" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
-        <infoLink id="45db-78f8-a674-1010" name="East India Privateers" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
+        <infoLink id="f940-d224-aae4-0cc6" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="c711-273f-b29d-ceda" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="df14-ec8f-b14d-4a8c" name="Skyfire�" hidden="false" targetId="1083-2af1-7bfc-7a55" type="rule"/>
+        <infoLink id="644c-7384-242c-ffa2" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="4a00-231c-141a-823b" name="Auspicio Regina�" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
+        <infoLink id="45db-78f8-a674-1010" name="East India Privateers�" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
+        <infoLink id="6794-11f5-cae9-5530" name="Maritime Patrol�" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="cf94-1089-1994-0e48" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -6446,23 +6498,43 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
               </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5af0-8323-0ef4-211d" type="min"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f211-562c-f1d3-e486" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f211-562c-f1d3-e486" type="max"/>
               </constraints>
               <entryLinks>
                 <entryLink id="692d-a72c-f359-518d" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3986-15b4-22f1-f1f6" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="9669-6cfe-86a3-d1d1" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c87f-dc33-2223-3677" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="04ad-b00b-8772-2606" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c9b7-dd17-dc6f-cf79" type="max"/>
+                  </constraints>
+                </entryLink>
+                <entryLink id="afa8-39bb-ca98-1eb8" name="Majestic Gun Battery" hidden="false" collective="false" import="true" targetId="2f2f-2489-8fb4-fe19" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f1cb-2997-ae34-363e" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+                  </costs>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
@@ -6536,41 +6608,25 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="df52-f98d-1fbe-7aca" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6a7b-a5d2-ed2b-50b4" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="7b8f-a2ff-45ae-a1ce" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7d33-80c6-6a3e-f45b" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="70bd-c155-1833-d928" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="ce74-4ffc-0df0-6151" name="Prow Ram" hidden="false" collective="false" import="true" targetId="b9d2-4d96-fe6c-c015" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0fb8-b74d-0087-899d" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="931c-ad37-f752-5562" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="5603-db52-7677-14a6" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7f94-bcc3-a4e8-7e67" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8eaa-9822-c861-0eed" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="87.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="90.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -6581,14 +6637,13 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="c4fe-c4f6-26a8-150d" name="Victory" hidden="false" targetId="6b25-6398-76ad-74aa" type="profile"/>
-        <infoLink id="12d2-ee75-6afb-5c54" name="Heavy Firepower" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="5e49-d3a1-728c-b9c2" name="Combat Air Patrol" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
-        <infoLink id="8bf6-68f9-4306-e475" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="9e8b-a939-eb2b-d599" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="0e5d-0bc6-fcb4-1f3f" name="SRS Mine Clearance" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
-        <infoLink id="ed3e-7152-8865-024d" name="SRS Recon Flight" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
-        <infoLink id="319b-43e0-cd3e-7c12" name="Defiant Tail Gunners" hidden="false" targetId="9f0c-1181-e9a6-84a7" type="rule"/>
-        <infoLink id="70ad-11db-39c5-19c5" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="12d2-ee75-6afb-5c54" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="5e49-d3a1-728c-b9c2" name="Combat Air Patrol�" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
+        <infoLink id="8bf6-68f9-4306-e475" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="9e8b-a939-eb2b-d599" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="0e5d-0bc6-fcb4-1f3f" name="SRS Mine Clearance�" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
+        <infoLink id="ed3e-7152-8865-024d" name="SRS Recon�" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
+        <infoLink id="70ad-11db-39c5-19c5" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="b60e-e656-b882-9148" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -6632,11 +6687,17 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b94c-7ae8-f4af-4f4f" type="max"/>
+                  </constraints>
                 </entryLink>
-                <entryLink id="2422-a3fe-32b9-6fe3" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="2422-a3fe-32b9-6fe3" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c7a3-b1b3-1e5c-8c93" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -6646,18 +6707,24 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
             <selectionEntryGroup id="005b-30ef-05d7-c4a1" name="Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="3bd4-229c-7759-55ab">
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a1b0-b618-0a37-3ca6" type="min"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="eacd-12b8-3d1d-b0ff" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eacd-12b8-3d1d-b0ff" type="max"/>
               </constraints>
               <entryLinks>
                 <entryLink id="3bd4-229c-7759-55ab" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8541-b3b4-438d-c731" type="max"/>
+                  </constraints>
                 </entryLink>
-                <entryLink id="bfe9-e868-5bbc-f7ba" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="bfe9-e868-5bbc-f7ba" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3fc5-d73b-e3d6-b4b5" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -6674,11 +6741,17 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="de12-a62d-07ee-0cc1" type="max"/>
+                  </constraints>
                 </entryLink>
-                <entryLink id="f9a1-1652-6d98-af6a" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="f9a1-1652-6d98-af6a" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0163-9fae-8edf-c973" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -6689,24 +6762,19 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="2a2b-f02b-448e-af3c" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="110e-749a-0199-27be" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="53f7-1be8-1ec1-d320" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="230e-e63a-3ef3-bc44" type="max"/>
-          </constraints>
+        <entryLink id="2a2b-f02b-448e-af3c" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
+          </modifiers>
         </entryLink>
-        <entryLink id="0883-17bc-84ef-bf3b" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="0883-17bc-84ef-bf3b" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="179a-4bc3-c4d4-b5d5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="efb7-f0cd-aed7-d7ef" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b940-9d84-0d5d-31b6" type="min"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="300.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="299.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -6717,15 +6785,14 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="5502-6fe7-5444-f92e" name="HMS Ark Royal" hidden="false" targetId="514d-4cc4-06f1-3f20" type="profile"/>
-        <infoLink id="9115-cc09-db83-6788" name="Heavy Firepower" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="c818-f748-8213-f8ae" name="Combat Air Patrol" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
-        <infoLink id="d8e8-b6b4-814f-eb6e" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="c5f8-17cd-79c2-fac8" name="Inspirational" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
-        <infoLink id="c661-7347-7a31-c9f3" name="SRS Recon Flight" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
-        <infoLink id="9b7b-66d8-7cba-2c8f" name="Defiant Tail Gunners" hidden="false" targetId="9f0c-1181-e9a6-84a7" type="rule"/>
-        <infoLink id="228c-ac4d-70c3-a49d" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="1bf0-799d-def5-063a" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
-        <infoLink id="5875-2713-d835-2eba" name="SRS Mine Clearance" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
+        <infoLink id="9115-cc09-db83-6788" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="c818-f748-8213-f8ae" name="Combat Air Patrol�" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
+        <infoLink id="d8e8-b6b4-814f-eb6e" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="c5f8-17cd-79c2-fac8" name="Inspirational�" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
+        <infoLink id="c661-7347-7a31-c9f3" name="SRS Recon�" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
+        <infoLink id="228c-ac4d-70c3-a49d" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="1bf0-799d-def5-063a" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="5875-2713-d835-2eba" name="SRS Mine Clearance�" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="0ea6-a69c-c716-6aaf" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -6754,35 +6821,27 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         </selectionEntry>
       </selectionEntries>
       <entryLinks>
-        <entryLink id="ac4d-b010-237b-9e2f" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="110e-749a-0199-27be" type="selectionEntry">
+        <entryLink id="ac4d-b010-237b-9e2f" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cbb8-255d-2424-a4fa" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0e58-2da5-63c6-67d3" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="fb18-f2a0-7c17-cdc6" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="fb18-f2a0-7c17-cdc6" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="179a-4bc3-c4d4-b5d5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="346b-7c4e-3361-c31b" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c456-ae65-4044-1a45" type="min"/>
-          </constraints>
         </entryLink>
-        <entryLink id="0b7c-5273-458e-bb17" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+        <entryLink id="0b7c-5273-458e-bb17" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
         </entryLink>
-        <entryLink id="9816-0572-1e16-7802" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+        <entryLink id="9816-0572-1e16-7802" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
           </modifiers>
         </entryLink>
-        <entryLink id="8561-476d-1496-3912" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+        <entryLink id="8561-476d-1496-3912" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
           </modifiers>
@@ -6822,12 +6881,13 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
             </modifierGroup>
           </modifierGroups>
         </infoLink>
-        <infoLink id="aa0a-da1d-e4f1-090b" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
-        <infoLink id="3645-2b50-69c3-4a4c" name="Heavy Firepower" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="77b7-b533-46cf-09d8" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="27d5-727d-4cd2-0c3d" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="8044-ed68-4cb5-18ac" name="Fortunes of War" hidden="false" targetId="949d-d37f-c7c8-1093" type="rule"/>
-        <infoLink id="0bfe-d985-8961-92b3" name="Logistical Support" hidden="false" targetId="408e-7b40-68d7-059f" type="rule"/>
+        <infoLink id="aa0a-da1d-e4f1-090b" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="3645-2b50-69c3-4a4c" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="77b7-b533-46cf-09d8" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="27d5-727d-4cd2-0c3d" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="8044-ed68-4cb5-18ac" name="Fortunes of War�" hidden="false" targetId="949d-d37f-c7c8-1093" type="rule"/>
+        <infoLink id="0bfe-d985-8961-92b3" name="Logistical Support�" hidden="false" targetId="408e-7b40-68d7-059f" type="rule"/>
+        <infoLink id="1fa6-ea55-43f5-7a42" name="Giant Slayer�" hidden="false" targetId="0d99-00ae-4c22-20b7" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="2e0b-7e65-070b-e4ce" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -6838,61 +6898,36 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="005a-c038-189a-a942" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6870-109b-e733-3e56" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="7050-3793-f0bb-1262" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a329-5a43-9e49-2fb8" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d70b-e49c-8571-6821" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="ffeb-8979-fbbc-4646" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="ffeb-8979-fbbc-4646" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bdd1-5917-4c5b-4896" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2ec6-0ad1-1e55-ea99" type="min"/>
-          </constraints>
         </entryLink>
-        <entryLink id="ab17-fbe0-b7ed-6ad5" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+        <entryLink id="ab17-fbe0-b7ed-6ad5" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="45e9-72c3-2aa3-e96d" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="909a-facc-6d11-597d" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="a6e7-515b-af6c-dd72" name="Prow Ram" hidden="false" collective="false" import="true" targetId="b9d2-4d96-fe6c-c015" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8f79-2983-a78d-9ba6" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fcf9-d0d1-bdee-07e5" type="max"/>
-          </constraints>
+          <modifiers>
+            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+          </modifiers>
         </entryLink>
-        <entryLink id="3ba3-ee0c-db23-2b25" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+        <entryLink id="3ba3-ee0c-db23-2b25" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="992d-8b50-11d9-17ab" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6a1d-12e4-214b-6cd7" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="af3a-83b7-1070-f332" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+        <entryLink id="af3a-83b7-1070-f332" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5e2f-020b-ec64-c7cf" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e871-c48c-1238-ba5a" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -6901,18 +6936,6 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </costs>
     </selectionEntry>
     <selectionEntry id="2f7c-749d-c7c3-9464" name="Toronto" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="model">
-      <modifiers>
-        <modifier type="add" field="category" value="ccff-8bb4-a85a-6bbc">
-          <conditions>
-            <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="78eb-3e40-3aaa-e72f" type="equalTo"/>
-          </conditions>
-        </modifier>
-        <modifier type="add" field="category" value="61b1-7830-7924-391d">
-          <conditions>
-            <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="501a-26ce-4afe-31d5" type="equalTo"/>
-          </conditions>
-        </modifier>
-      </modifiers>
       <constraints>
         <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0d78-5375-3605-34fb" type="min"/>
         <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9f1b-58b8-0b56-9ea9" type="max"/>
@@ -6921,213 +6944,120 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <infoLink id="a3e5-3360-0fd1-d935" name="Toronto" hidden="false" targetId="cd8a-4413-9e89-5497" type="profile"/>
         <infoLink id="b0e8-e5f2-cb26-f57f" name="Ablative Prow Armour" hidden="false" targetId="2823-33a9-a62b-e29a" type="rule"/>
         <infoLink id="1b97-036a-81f5-454d" name="Loyal She Began; Thus She Remains" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
-        <infoLink id="60a3-4d36-98cb-a030" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="60a3-4d36-98cb-a030" name="Rocket Barrage�" hidden="false" targetId="1042-355a-94f3-b6be" type="rule"/>
         <infoLink id="99d9-cf98-1491-3492" name="Anti-Air Specialist" hidden="false" targetId="7baa-3e4c-35ea-5614" type="rule"/>
         <infoLink id="d2ea-4851-2856-f246" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
         <infoLink id="d2dc-20a3-64f1-6e7e" name="Fortunes of War" hidden="false" targetId="949d-d37f-c7c8-1093" type="rule"/>
-        <infoLink id="a249-44ca-6281-e414" name="Vulnerable Stern" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="a249-44ca-6281-e414" name="Vulnerable Stern�" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule">
+          <modifiers>
+            <modifier type="set" field="hidden" value="true">
+              <conditions>
+                <condition field="selections" scope="2f7c-749d-c7c3-9464" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="bb5c-56d7-ffa2-5b05" type="atLeast"/>
+              </conditions>
+            </modifier>
+          </modifiers>
+        </infoLink>
+        <infoLink id="f2f9-eb4b-d9dc-320d" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="ee8b-4977-6ffd-1207" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
         <categoryLink id="a863-bc76-1ae1-7ba9" name="Control Cruiser" hidden="false" targetId="a9a1-5c58-9d30-452a" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="b94d-b24f-a973-ac66" name="Main Weapon" hidden="false" collective="false" import="true">
-          <constraints>
-            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8e14-7098-d9ee-c0df" type="min"/>
-            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ad64-16ce-774e-3f0a" type="max"/>
-          </constraints>
-          <selectionEntryGroups>
-            <selectionEntryGroup id="46e0-c68b-c4b0-2ee6" name="Front First" hidden="false" collective="false" import="true" defaultSelectionEntryId="60be-c30c-9f45-bee6">
-              <modifiers>
-                <modifier type="set" field="0c71-e64a-3aca-5495" value="0.0">
-                  <conditions>
-                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="25b9-7f26-cbd9-e68f" type="atLeast"/>
-                  </conditions>
-                </modifier>
-              </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0c71-e64a-3aca-5495" type="min"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e977-ced2-0479-81d7" type="max"/>
-              </constraints>
-              <entryLinks>
-                <entryLink id="60be-c30c-9f45-bee6" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
-                  </modifiers>
-                </entryLink>
-              </entryLinks>
-            </selectionEntryGroup>
-            <selectionEntryGroup id="8d55-6592-0b10-07a6" name="Front Second" hidden="false" collective="false" import="true" defaultSelectionEntryId="81f2-844c-30ac-2f79">
-              <modifiers>
-                <modifier type="set" field="dd95-963b-dbfa-6b98" value="0.0">
-                  <conditions>
-                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="25b9-7f26-cbd9-e68f" type="atLeast"/>
-                  </conditions>
-                </modifier>
-              </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dd95-963b-dbfa-6b98" type="min"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b3b1-8b62-8e6e-e994" type="max"/>
-              </constraints>
-              <entryLinks>
-                <entryLink id="81f2-844c-30ac-2f79" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
-                  </modifiers>
-                </entryLink>
-              </entryLinks>
-            </selectionEntryGroup>
-            <selectionEntryGroup id="f355-2e93-b738-a578" name="Generator" hidden="false" collective="false" import="true">
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8cb7-ac94-b514-87c2" type="max"/>
-              </constraints>
-              <categoryLinks>
-                <categoryLink id="7169-307c-7238-cfcb" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
-              </categoryLinks>
-              <entryLinks>
-                <entryLink id="64b6-9a27-db96-6983" name="Atomic generator" hidden="false" collective="false" import="true" targetId="eef0-442d-aa6f-b314" type="selectionEntry">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b563-e78b-267f-cb77" type="max"/>
-                  </constraints>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="17da-6038-dad4-5f12" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1638-1a63-3769-6f8d" type="max"/>
-                  </constraints>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="b485-77f7-c80d-2e45" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2255-5f81-4f27-4cb1" type="max"/>
-                  </constraints>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="13ed-f459-41c3-d80c" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="add" field="category" value="8901-cc02-f55e-2ee5"/>
-                    <modifier type="append" field="name" value=" (2)"/>
-                  </modifiers>
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9e2c-7856-289c-5801" type="max"/>
-                  </constraints>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="8fd5-70bf-6b6f-539a" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="42de-956d-c9d9-e59a" type="max"/>
-                  </constraints>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="a77f-0583-fe85-be8c" name="Trident generator" hidden="false" collective="false" import="true" targetId="4f9f-bf12-daca-15ed" type="selectionEntry">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e2b6-95a3-72b6-164d" type="max"/>
-                  </constraints>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
-                  </costs>
-                </entryLink>
-              </entryLinks>
-            </selectionEntryGroup>
-          </selectionEntryGroups>
-        </selectionEntryGroup>
         <selectionEntryGroup id="20dd-6f40-f0bf-d5d4" name="Secondary Weapon" hidden="false" collective="false" import="true">
-          <modifiers>
-            <modifier type="set" field="8220-0611-08e6-de76" value="1.0">
-              <conditionGroups>
-                <conditionGroup type="or">
-                  <conditions>
-                    <condition field="selections" scope="ancestor" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="61b1-7830-7924-391d" type="instanceOf"/>
-                    <condition field="selections" scope="ancestor" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ccff-8bb4-a85a-6bbc" type="instanceOf"/>
-                  </conditions>
-                </conditionGroup>
-              </conditionGroups>
-            </modifier>
-          </modifiers>
           <constraints>
             <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8220-0611-08e6-de76" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dfa6-0160-dcbd-809f" type="max"/>
           </constraints>
           <entryLinks>
-            <entryLink id="45bc-a33a-e920-1596" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
+            <entryLink id="45bc-a33a-e920-1596" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
               <modifiers>
                 <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
-                <modifier type="set" field="7a0f-91a9-f9a6-a70d" value="1.0">
-                  <conditions>
-                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="61b1-7830-7924-391d" type="instanceOf"/>
-                  </conditions>
-                </modifier>
               </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7a0f-91a9-f9a6-a70d" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a1cc-0168-0dea-95ca" type="max"/>
               </constraints>
+              <categoryLinks>
+                <categoryLink id="573e-14d3-60b6-7983" name="Rear Weapon" hidden="false" targetId="bb5c-56d7-ffa2-5b05" primary="false"/>
+              </categoryLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="15.0"/>
+              </costs>
             </entryLink>
-            <entryLink id="d4d2-cab1-1e61-cf5a" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+            <entryLink id="d4d2-cab1-1e61-cf5a" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
               <modifiers>
                 <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
-                <modifier type="set" field="8e4f-8584-ed7b-a6fa" value="1.0">
-                  <conditions>
-                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ccff-8bb4-a85a-6bbc" type="instanceOf"/>
-                  </conditions>
-                </modifier>
               </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8e4f-8584-ed7b-a6fa" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4ac3-2928-f436-aef1" type="max"/>
               </constraints>
+              <categoryLinks>
+                <categoryLink id="442b-a089-be54-a0af" name="Rear Weapon" hidden="false" targetId="bb5c-56d7-ffa2-5b05" primary="false"/>
+              </categoryLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="15.0"/>
+              </costs>
+            </entryLink>
+            <entryLink id="d55b-0796-11bb-8087" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6224-d187-7b3e-197d" type="max"/>
+              </constraints>
+              <categoryLinks>
+                <categoryLink id="4d1d-07db-3147-c59b" name="Rear Weapon" hidden="false" targetId="bb5c-56d7-ffa2-5b05" primary="false"/>
+              </categoryLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="15.0"/>
+              </costs>
             </entryLink>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="b185-3a02-3974-943b" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="b185-3a02-3974-943b" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eb51-d79c-bf46-0345" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eeb9-8509-3560-d9a2" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="9798-2206-0202-c1bb" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="102e-6daa-b3b1-ae82" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="85e6-7c4a-a5ed-cfe1" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="8906-c7f2-c4ca-5fab" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
+        </entryLink>
+        <entryLink id="de4e-d81f-f39e-86c2" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="f7e0-fd3a-7201-ad0f" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+          </modifiers>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9807-294c-dc22-aaa5" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0e47-b068-65a7-dace" type="max"/>
+          </constraints>
+        </entryLink>
+        <entryLink id="804f-22f4-9980-7b15" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="f7e0-fd3a-7201-ad0f" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+          </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d106-8eb9-7d1e-9bb7" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d2ba-d9fa-c16f-e99b" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8501-8236-cd9a-7bb3" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d3f5-e22f-c443-7f4c" type="max"/>
           </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="150.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="140.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="20a2-2b29-a51e-0077" name="No. 1 Squadron" hidden="false" collective="true" import="true" type="upgrade">
       <infoLinks>
-        <infoLink id="2c54-8fc2-352f-aae7" name="No.1 Squadron�" hidden="false" targetId="e4c0-65b1-6461-2f51" type="rule"/>
+        <infoLink id="2c54-8fc2-352f-aae7" name="No.1 Squadron (3.04)" hidden="false" targetId="e4c0-65b1-6461-2f51" type="rule"/>
       </infoLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
@@ -7148,7 +7078,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <infoLink id="313b-7219-90a1-6ce0" name="Landing Vessel�" hidden="false" targetId="4869-03db-33f9-fa82" type="rule"/>
         <infoLink id="4202-0f5a-e357-426b" name="Hydrophone Relay�" hidden="false" targetId="1b80-20ba-6dae-7094" type="rule"/>
         <infoLink id="6a30-6287-9b40-24b9" name="Rocketeer Flight�" hidden="false" targetId="04ee-5a1c-f3c8-3e5f" type="rule"/>
-        <infoLink id="4f7d-1e2a-f5df-5d57" name="Loyal She Began; Thus She Remains*" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
+        <infoLink id="4f7d-1e2a-f5df-5d57" name="Loyal She Began; Thus She Remains�" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
         <infoLink id="c3ab-d9fb-b848-2f03" name="Auspicio Regina�" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
         <infoLink id="f76e-a21d-1faf-d32a" name="East India Privateers�" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
       </infoLinks>
@@ -7161,41 +7091,25 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ed8e-c508-c2ce-67c5" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8526-4c49-e6ed-02c6" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="5092-a90a-b7b3-14ec" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5888-87ac-f851-165d"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b2d2-77d7-0acd-cefe" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9c55-1b52-ad87-318d" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="cef0-f45b-ae89-c357" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c7f3-8b73-60ce-1933" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9cbf-3621-b306-3159" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="a518-334e-f1f9-43d0" name="Light Broadside" hidden="false" collective="false" import="true" targetId="fc11-e98a-2d7f-198c" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f2f9-8292-87ad-4591" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f1bb-177f-6679-5ff9" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="50.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="48.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -7206,14 +7120,14 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="e7e7-69a7-b302-836e" name="Saxon" hidden="false" targetId="49c8-8dab-53f7-a13d" type="profile"/>
-        <infoLink id="7b19-81e8-35f8-1ad7" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
-        <infoLink id="f65f-a53d-88df-e00e" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="2c3f-1f05-157f-af84" name="Powerslide" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="fecf-ac58-a174-e9cf" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="d2a5-9933-d9de-a691" name="Linear Dash" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
-        <infoLink id="6009-50a0-b9ab-d9c8" name="Skyfire" hidden="false" targetId="1083-2af1-7bfc-7a55" type="rule"/>
-        <infoLink id="d196-3b32-c0f6-537b" name="Vanguard*" hidden="false" targetId="f721-8318-3875-0140" type="rule"/>
-        <infoLink id="8a5e-7ba8-3d0d-e45a" name="Loyal She Began; Thus She Remains" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
+        <infoLink id="7b19-81e8-35f8-1ad7" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="f65f-a53d-88df-e00e" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="2c3f-1f05-157f-af84" name="Powerslide�" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="fecf-ac58-a174-e9cf" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="d2a5-9933-d9de-a691" name="Linear Dash�" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
+        <infoLink id="6009-50a0-b9ab-d9c8" name="Skyfire�" hidden="false" targetId="1083-2af1-7bfc-7a55" type="rule"/>
+        <infoLink id="d196-3b32-c0f6-537b" name="Vanguard�" hidden="false" targetId="f721-8318-3875-0140" type="rule"/>
+        <infoLink id="8a5e-7ba8-3d0d-e45a" name="Loyal She Began; Thus She Remains�" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
         <infoLink id="58c9-858f-8997-8dfe" name="Corvette Duty�" hidden="false" targetId="4836-a907-b316-55b2" type="rule"/>
         <infoLink id="c826-0b39-a6a7-0e16" name="East India Privateers�" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
         <infoLink id="4a89-cc17-7062-252a" name="Auspicio Regina�" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
@@ -7223,23 +7137,15 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <categoryLink id="0a08-4d25-3542-e0fd" name="Scout Rotor" hidden="false" targetId="9f0d-822d-da50-a399" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="4e40-cde7-7ee6-06ef" name="Rocket Battery" hidden="false" collective="true" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="4e40-cde7-7ee6-06ef" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eb80-25e9-9cb6-cd76" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a4a3-6175-71ad-0c87" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="4a1e-2218-0d02-ee83" name="Light Torpedo Salvo " hidden="false" collective="false" import="true" targetId="52b3-c089-982f-d135" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fb6e-7a4f-401f-c73d" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="79df-f3ac-8747-025a" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -7290,16 +7196,25 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d4c6-3008-72ba-0475" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="7793-9935-86ca-a89a" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2745-3608-9317-5e13" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="1f2b-baf2-825b-0a10" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4687-ebc0-cdf6-11a7" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -7323,16 +7238,25 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="704d-4abb-c328-d36b" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="900e-5ce7-5cae-344d" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="171f-408f-74db-61da" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="d669-79de-56ab-ef30" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e00c-6b43-93fb-f67c" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -7409,32 +7333,20 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6f15-893a-b73e-4c7a" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="002f-803f-71e9-ab02" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="5e04-c632-c0d4-4be0" name="Bananach Phosphor Bombs" hidden="false" collective="false" import="true" targetId="0946-1dc0-1c55-5716" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5888-87ac-f851-165d"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b8e7-84f4-8088-71fc" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="09f7-9ac6-3ea6-9433" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="b838-191c-732d-6463" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="b838-191c-732d-6463" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0acb-b4c4-ecf2-3761" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="28ae-4f36-f7c6-a99d" type="min"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="120.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="117.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -7450,9 +7362,10 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <infoLink id="a0ac-e123-566f-828f" name="Hydrophone Relay�" hidden="false" targetId="1b80-20ba-6dae-7094" type="rule"/>
         <infoLink id="d7f4-202c-7bb7-881b" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
         <infoLink id="5dd2-f365-c428-b454" name="Forward Deployment�" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
-        <infoLink id="7df8-b0f4-74e8-bcc0" name="Auspicio Regina�" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
+        <infoLink id="7df8-b0f4-74e8-bcc0" name="Cloud Hunting�" hidden="false" targetId="cfe8-adc4-4866-0bc8" type="rule"/>
         <infoLink id="cc88-a22d-b3b3-4ea2" name="East India Privateers�" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
-        <infoLink id="dcd1-0fad-f718-167e" name="Linear Dash�" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
+        <infoLink id="dcd1-0fad-f718-167e" name="Linear Dash (3.04)" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
+        <infoLink id="d0ec-76d8-0c87-2d63" name="Auspicio Regina�" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="13bb-e230-64bf-0c26" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -7463,28 +7376,16 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f5c3-9d01-b239-b016" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="680c-cbd5-a7f0-144d" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="053a-0fa2-e96a-ef97" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="52cb-f263-faf4-2ad2" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="83ce-02ce-07f1-4f69" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="d90c-37ad-c6d6-9d81" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="aa3e-dda1-3ac7-5999" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="52c3-c9b2-b347-ca55" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -7499,16 +7400,17 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="4c43-a27f-dc55-df5a" name="Ross" hidden="false" targetId="d724-8d4c-2694-283c" type="profile"/>
-        <infoLink id="c252-bf3c-648d-080c" name="Forward Deployment" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
-        <infoLink id="adbb-6b57-95dc-c092" name="Immobile" hidden="false" targetId="8aa1-f648-12bd-a1c6" type="rule"/>
-        <infoLink id="06cf-1cbd-24ab-66a0" name="Heavy Escort" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
-        <infoLink id="a3d5-c262-76f3-2839" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="6c6d-fc8a-5eed-b654" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="ff90-f845-8cbf-3d2d" name="Strategic Asset" hidden="false" targetId="12ec-f9c6-b68b-913b" type="rule"/>
+        <infoLink id="c252-bf3c-648d-080c" name="Forward Deployment�" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
+        <infoLink id="adbb-6b57-95dc-c092" name="Immobile�" hidden="false" targetId="8aa1-f648-12bd-a1c6" type="rule"/>
+        <infoLink id="06cf-1cbd-24ab-66a0" name="Heavy Escort�" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
+        <infoLink id="a3d5-c262-76f3-2839" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="6c6d-fc8a-5eed-b654" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="ff90-f845-8cbf-3d2d" name="Strategic Asset�" hidden="false" targetId="12ec-f9c6-b68b-913b" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="e142-75b3-b857-716b" name="Battle Platform" hidden="false" targetId="8b0e-929f-ad70-2b6a" primary="false"/>
         <categoryLink id="19c8-b460-3840-376e" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
+        <categoryLink id="dcb6-c9b2-7193-08dc" name="Irish" hidden="false" targetId="bf1b-5d15-a572-6d42" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="1e1f-d244-a61e-ede3" name="Secondary Weapon" hidden="false" collective="false" import="true">
@@ -7580,17 +7482,17 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a184-ff30-7b59-e29a" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="5435-f4bf-2c29-bd49" name="Forward Deployment" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
-        <infoLink id="61be-73ff-db17-498d" name="Heavy Escort" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
-        <infoLink id="8afd-a414-24f9-f3db" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="5435-f4bf-2c29-bd49" name="Forward Deployment�" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
+        <infoLink id="61be-73ff-db17-498d" name="Heavy Escort�" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
+        <infoLink id="8afd-a414-24f9-f3db" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
         <infoLink id="0ef3-fdd4-e7ff-7a93" name="Dublin" hidden="false" targetId="a70e-d863-1d48-c46f" type="profile"/>
-        <infoLink id="6659-7c64-b017-1683" name="Immobile" hidden="false" targetId="8aa1-f648-12bd-a1c6" type="rule"/>
-        <infoLink id="ceb6-1afb-d27a-acc9" name="Strategic Asset" hidden="false" targetId="12ec-f9c6-b68b-913b" type="rule"/>
-        <infoLink id="de8c-b88c-8298-4f2d" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="6659-7c64-b017-1683" name="Immobile�" hidden="false" targetId="8aa1-f648-12bd-a1c6" type="rule"/>
+        <infoLink id="ceb6-1afb-d27a-acc9" name="Strategic Asset�" hidden="false" targetId="12ec-f9c6-b68b-913b" type="rule"/>
+        <infoLink id="de8c-b88c-8298-4f2d" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
       </infoLinks>
       <categoryLinks>
-        <categoryLink id="7133-6ef4-ed81-8eab" name="War Platform" hidden="false" targetId="e036-10f0-615f-6a77" primary="false"/>
         <categoryLink id="d48a-02e5-0e69-b1d1" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
+        <categoryLink id="3f63-caf7-1539-a0ba" name="Heavy Platform" hidden="false" targetId="fbfb-0ffd-73fa-8e0a" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="67f3-1a3f-e3f4-323e" name="Main Weapon" hidden="false" collective="false" import="true">
@@ -7602,18 +7504,24 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
             <selectionEntryGroup id="e1f5-ef7b-0166-eb4e" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="71d0-8ec1-a53a-ef37">
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="57ba-db7b-481e-766c" type="min"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="91c2-c6ff-0ce8-b010" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="91c2-c6ff-0ce8-b010" type="max"/>
               </constraints>
               <entryLinks>
                 <entryLink id="71d0-8ec1-a53a-ef37" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6488-3e6c-963b-b4c5" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="e2ed-1636-6f67-a010" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9d74-16e0-3f72-6c2f" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -7622,6 +7530,9 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0765-b3b5-0147-9cc1" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -7630,6 +7541,9 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="01ee-f3e2-4868-67ac" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -7646,11 +7560,17 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6d5f-a4af-26eb-cc73" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="9d23-53e8-f48f-c213" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4905-89e9-43e7-423f" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -7659,6 +7579,9 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f560-d903-3722-fac8" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -7667,6 +7590,9 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f808-c7ff-4c46-aa2e" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -7683,6 +7609,9 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4666-5d9b-60e4-68d5" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
@@ -7691,11 +7620,17 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8eb1-204f-398d-7063" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="9916-07ec-0e72-1860" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8167-fa84-97e8-6f40" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -7704,6 +7639,9 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d3a0-b6d6-d752-4471" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -7961,11 +7899,11 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="d095-dc1f-bc54-d3d7" name="Gloriana" hidden="false" targetId="e910-6811-d55a-8c8e" type="profile"/>
-        <infoLink id="803b-de8d-a42c-4026" name="Heavy Firepower" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="4927-ad7c-9a86-4b6a" name="Inspirational" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
-        <infoLink id="58a8-ca9c-c27f-511b" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
-        <infoLink id="a4fe-276a-a166-ea03" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="1b3c-61e8-ce77-8967" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="803b-de8d-a42c-4026" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="4927-ad7c-9a86-4b6a" name="Inspirational�" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
+        <infoLink id="58a8-ca9c-c27f-511b" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="a4fe-276a-a166-ea03" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="1b3c-61e8-ce77-8967" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="bee6-70e3-a3ee-bacb" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -7995,19 +7933,28 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c73e-d983-f0e9-d94f" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="c6cb-8645-d1d2-2d70" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1016-ceb5-3559-9c39" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
-                <entryLink id="3d14-0e9a-ea1b-e438" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="3d14-0e9a-ea1b-e438" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9609-7028-8ab0-e588" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -8016,6 +7963,9 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="53ec-a555-1772-a979" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -8079,7 +8029,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5be7-d13a-2028-2139" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="223c-05d7-bda9-5813" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry">
@@ -8087,7 +8037,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4e3d-6a9c-3c03-f287" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="0315-8c57-3232-cb1c" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry">
@@ -8095,7 +8045,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c393-00e7-94ac-6aa0" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="a053-0bce-c82d-50d6" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
@@ -8107,7 +8057,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5363-cccf-91d4-1626" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="9242-c81d-b898-cfa6" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
@@ -8115,7 +8065,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="23bf-16af-4544-e501" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="9dcb-1b85-ff61-391a" name="Trident generator" hidden="false" collective="false" import="true" targetId="4f9f-bf12-daca-15ed" type="selectionEntry">
@@ -8123,7 +8073,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e0e1-6859-19b6-6c75" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
               </entryLinks>
@@ -8138,26 +8088,35 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
               </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9c8f-40e5-c39c-7172" type="min"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="eeda-9472-cf83-b1a3" type="max"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eeda-9472-cf83-b1a3" type="max"/>
               </constraints>
               <entryLinks>
                 <entryLink id="202c-4554-eb52-cf41" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d01b-b201-b10a-3685" type="max"/>
+                  </constraints>
                 </entryLink>
                 <entryLink id="90f6-e12d-9120-0b2b" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="65b3-d9a8-e0a3-a028" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="06d9-3582-6a80-7324" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
-                <entryLink id="fd88-b110-cb5f-70fb" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="fd88-b110-cb5f-70fb" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9c18-cabb-b9f5-6e37" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -8166,6 +8125,9 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e0bd-59b5-43d6-bc92" type="max"/>
+                  </constraints>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
                   </costs>
@@ -8218,83 +8180,187 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
+        <selectionEntryGroup id="e7f0-c9ad-5e8d-81f2" name="Secondary Weapon" hidden="false" collective="false" import="true">
+          <selectionEntryGroups>
+            <selectionEntryGroup id="9001-2d7e-e174-9591" name="Front Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="0c07-7fe6-c702-2be2">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="48f4-6cb1-f6ae-18bd" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ae7a-36a2-caf6-c2a1" type="max"/>
+              </constraints>
+              <entryLinks>
+                <entryLink id="0c07-7fe6-c702-2be2" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6c30-4dc9-c4a0-4f82" type="max"/>
+                  </constraints>
+                </entryLink>
+                <entryLink id="04b6-7e3f-a03d-f34b" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f0e2-e56a-5d6f-6f75" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="dc5b-7163-ae9d-0b25" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bfa9-4697-4fae-fc0e" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+            <selectionEntryGroup id="e4f8-2e51-f245-0bf2" name="Rear Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="55a9-4e0a-beb1-4004">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="900f-584e-f74a-ebbb" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="19ff-a900-a03f-7624" type="max"/>
+              </constraints>
+              <entryLinks>
+                <entryLink id="55a9-4e0a-beb1-4004" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ea81-b23b-c191-596a" type="max"/>
+                  </constraints>
+                </entryLink>
+                <entryLink id="d612-602a-e368-4d4b" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7ef7-2886-bb23-a271" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="ccac-1b4f-16f4-7ee1" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f257-cbb6-952c-0b8e" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+            <selectionEntryGroup id="380f-d3e0-cf1b-65a4" name="Front Stardoard" hidden="false" collective="false" import="true" defaultSelectionEntryId="45e7-0e3a-0729-1e5b">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="28b6-701a-e5be-4763" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="07b5-e9c6-dc8a-0b40" type="max"/>
+              </constraints>
+              <entryLinks>
+                <entryLink id="45e7-0e3a-0729-1e5b" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e65c-5acf-9017-c499" type="max"/>
+                  </constraints>
+                </entryLink>
+                <entryLink id="7e7a-6a65-e0f7-057a" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a8e5-79c3-6e24-5a39" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="35ef-0cb6-d0aa-1c4f" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a364-3311-1161-8b60" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+            <selectionEntryGroup id="4ce5-e61b-f7dd-d5fb" name="Rear Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="1b2f-bda4-c32f-ebf1">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0a90-ade1-765c-9bb7" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="59ae-a0be-2c5c-a1cf" type="max"/>
+              </constraints>
+              <entryLinks>
+                <entryLink id="1b2f-bda4-c32f-ebf1" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6a00-39d0-6c45-354d" type="max"/>
+                  </constraints>
+                </entryLink>
+                <entryLink id="37c3-f6ed-ac0e-db98" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c0ab-db86-c764-73b8" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="20b4-d220-3432-996a" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fbf9-ce4b-7b53-e82b" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+          </selectionEntryGroups>
+        </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
         <entryLink id="6d34-ed0f-6f7d-a16a" name="Heavy Prow Ram" hidden="false" collective="false" import="true" targetId="3b69-5936-2ff8-bc08" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6a9e-fd99-3810-2fb3" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="962c-17cd-5c4c-8711" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="89e3-667e-77b6-5257" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b7ca-ecc0-8591-366b" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e96a-e09b-0817-7ff9" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="3666-3add-6885-e9ca" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="3666-3add-6885-e9ca" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5935-bcd7-b498-5f40"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="689e-7b60-3096-1420" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0658-2563-4878-09f4" type="min"/>
-          </constraints>
         </entryLink>
-        <entryLink id="36c5-b558-243c-f607" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="110e-749a-0199-27be" type="selectionEntry">
+        <entryLink id="36c5-b558-243c-f607" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2e36-d5df-7edc-27c7" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="47a5-065a-1886-afa8" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="efe1-6c9c-22d1-b637" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
-          <modifiers>
-            <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="175c-139e-1f23-9975" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="38e2-6388-d38a-db05" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="a904-5e98-96d7-f5ca" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
-          <modifiers>
-            <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="183d-5bed-99e9-f996" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7184-40ce-fbba-f3ef" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="0b77-9279-bd34-70e5" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
-          <modifiers>
-            <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ba77-cae9-2a20-9594" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="350e-8822-e2b8-88e7" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="92c4-f163-5eb9-ddb6" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
-          <modifiers>
-            <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="43d8-12ec-6488-2f85" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f49f-6551-f648-d99d" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="350.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="325.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -8305,12 +8371,12 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="9b01-b00d-87cd-e08e" name="Camelot" hidden="false" targetId="38c0-8e49-ff56-3705" type="profile"/>
-        <infoLink id="bc66-7714-6250-93d3" name="Heavy Firepower" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="4271-579d-42bb-d14b" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
-        <infoLink id="a6f3-44d0-1aed-719d" name="Inspirational" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
-        <infoLink id="3431-7d6b-ade1-a2b6" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="4998-2a27-92d2-f9d5" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="1fcf-8966-b835-4bd3" name="Guardian Surge" hidden="false" targetId="25ea-b812-952e-dd7d" type="rule"/>
+        <infoLink id="bc66-7714-6250-93d3" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="4271-579d-42bb-d14b" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="a6f3-44d0-1aed-719d" name="Inspirational�" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
+        <infoLink id="3431-7d6b-ade1-a2b6" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="4998-2a27-92d2-f9d5" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="1fcf-8966-b835-4bd3" name="Guardian Surge�" hidden="false" targetId="25ea-b812-952e-dd7d" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="46b7-97a7-c6f1-60b0" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -8342,7 +8408,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
-                <entryLink id="4d91-6b5d-4484-457f" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="4d91-6b5d-4484-457f" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -8371,7 +8437,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
                 </entryLink>
-                <entryLink id="8d2c-c942-e232-c741" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="8d2c-c942-e232-c741" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
@@ -8416,7 +8482,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
-                <entryLink id="a203-8f7d-2c13-139f" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
+                <entryLink id="a203-8f7d-2c13-139f" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="57f7-e4c2-6115-938a" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -8442,37 +8508,21 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="41d9-6d69-ff19-724b" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f0b1-e388-9db1-add3" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="a03c-5df2-fea8-86b0" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="110e-749a-0199-27be" type="selectionEntry">
+        <entryLink id="a03c-5df2-fea8-86b0" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bb2a-88e3-0312-3a95" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fffe-3eda-543d-492b" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="16c1-3ad6-8de5-7a7f" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7004-2eba-9ed6-41ee" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="554d-ad49-3ac8-da2e" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="3d1b-f383-530d-8ade" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="3d1b-f383-530d-8ade" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="967e-22a1-ae69-7b4f"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="066f-beec-a9ec-7647" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ab24-406a-a644-2cd4" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -8487,20 +8537,20 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="632f-6d59-750f-5917" name="Avalon" hidden="false" targetId="4e93-90f9-8f72-2ec5" type="profile"/>
-        <infoLink id="705d-9aa7-84df-4d0d" name="Combat Air Patrol" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
-        <infoLink id="3af5-a61b-c409-576a" name="Flak Barrage" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
+        <infoLink id="705d-9aa7-84df-4d0d" name="Combat Air Patrol�" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
+        <infoLink id="3af5-a61b-c409-576a" name="Flak Barrage�" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
             <modifier type="append" field="name" value=" (10)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="d74a-3649-6657-54e8" name="Heavy Firepower" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="8a7f-3622-1647-d644" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
-        <infoLink id="5050-a436-7a1e-4ce4" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="bfb2-c43d-747e-f128" name="Lumbering" hidden="false" targetId="6b55-0f21-5c85-94cb" type="rule"/>
-        <infoLink id="d8ac-dd16-cb11-6c8c" name="Powerslide" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="9762-bc53-caf6-4e2e" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="4d18-3182-41b8-1016" name="SRS Mine Clearance" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
-        <infoLink id="04aa-e617-2a16-e62b" name="SRS Recon Flight" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
+        <infoLink id="d74a-3649-6657-54e8" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="8a7f-3622-1647-d644" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="5050-a436-7a1e-4ce4" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="bfb2-c43d-747e-f128" name="Lumbering�" hidden="false" targetId="6b55-0f21-5c85-94cb" type="rule"/>
+        <infoLink id="d8ac-dd16-cb11-6c8c" name="Powerslide�" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="9762-bc53-caf6-4e2e" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="4d18-3182-41b8-1016" name="SRS Mine Clearance�" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
+        <infoLink id="04aa-e617-2a16-e62b" name="SRS Recon�" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="2eba-d61b-4a56-55a9" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -8532,46 +8582,26 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3b76-5359-dbcb-e775" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b4c3-73fc-c899-0c4a" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="9f5f-4a88-4fc5-a1c3" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f4b2-d01e-8540-5587" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0428-6f89-8f43-10cc" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="4177-c4a8-ef35-d722" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="08ce-bb5b-5c86-4764" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e7bd-108a-0e33-1f58" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="0b8b-eb95-9b47-e40c" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="34fd-8a82-9ad0-aaec" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bf25-7402-07e8-9eec" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="14f7-d799-b772-b84e" name="Aerial Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="42d9-7905-6f80-7dea" type="selectionEntry">
+        <entryLink id="14f7-d799-b772-b84e" name="Aerial Heavy Torpedo Salvo" hidden="false" collective="false" import="true" targetId="14d9-7c9f-ea35-14af" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ddd7-d322-d23d-899f" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b12a-9257-24f9-7da4" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="3202-b799-0f0e-cd9d" name="Heavy Flak Broadside" hidden="false" collective="false" import="true" targetId="3e85-ccc4-d939-f7f8" type="selectionEntry">
           <modifiers>
@@ -8582,18 +8612,14 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bc5f-0fe9-d444-214a" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="4e27-c66e-ec15-24c6" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="4e27-c66e-ec15-24c6" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="179a-4bc3-c4d4-b5d5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="76b2-5e25-693e-188c" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1e2f-b3ce-e41d-865b" type="min"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="325.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="295.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -8667,7 +8693,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="a7b8-a12e-adfc-4a3b" name="Rear" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="a7b8-a12e-adfc-4a3b" name="Rear" hidden="false" collective="false" import="true" defaultSelectionEntryId="de44-7d6a-043d-1046">
               <modifiers>
                 <modifier type="set" field="81e5-8ec1-556e-aaec" value="0.0">
                   <conditions>
@@ -8847,7 +8873,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6729-d658-44e6-e674" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="e1d5-d913-c575-4533" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
@@ -8858,7 +8884,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b83a-053a-9ef1-35a6" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
               </entryLinks>
@@ -8885,7 +8911,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c158-914e-7b88-ef5a" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="4e76-cba8-7a07-0273" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
@@ -8896,7 +8922,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3f8b-3ce1-9a90-8f30" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
               </entryLinks>
@@ -8923,7 +8949,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d1b9-9fcf-ae36-faf8" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="76ff-f165-5893-8103" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
@@ -8934,7 +8960,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6262-8443-117d-caf3" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
               </entryLinks>
@@ -8961,7 +8987,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5b81-dc27-dca1-1c59" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="a3c9-f6b2-de8b-57eb" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
@@ -8972,7 +8998,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c0a4-2fd4-2f21-6b33" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
                   </costs>
                 </entryLink>
               </entryLinks>
@@ -8985,41 +9011,25 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ed87-f684-49f3-f847" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b8a4-67d7-ebc8-aa42" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="9c91-7de0-22b2-d7c9" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0d21-6f79-6dec-2cf5" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d745-27e7-6725-d4ab" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="7a7b-5722-a214-391c" name="Heavy Prow Ram" hidden="false" collective="false" import="true" targetId="3b69-5936-2ff8-bc08" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="127f-c774-6f95-f55f" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5180-9740-7871-f793" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="5445-43c9-76a1-f7e4" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="5445-43c9-76a1-f7e4" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="8901-cc02-f55e-2ee5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2349-1d0c-4402-d154" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4a14-cff3-3837-a3bf" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="360.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="320.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -9035,11 +9045,11 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
             <modifier type="set" field="name" value="HMS Indefatigable"/>
           </modifiers>
         </infoLink>
-        <infoLink id="0037-b33f-4586-9412" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
-        <infoLink id="72f5-0464-f19b-e561" name="Heavy Firepower" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="414b-e76a-0066-0b1d" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="506b-ed46-50f1-57b3" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="1bd4-d16e-c24c-6b46" name="Reliable Design" hidden="false" targetId="6f17-ddcb-35bc-4e97" type="rule"/>
+        <infoLink id="0037-b33f-4586-9412" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="72f5-0464-f19b-e561" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="414b-e76a-0066-0b1d" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="506b-ed46-50f1-57b3" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="1bd4-d16e-c24c-6b46" name="Reliable Design�" hidden="false" targetId="6f17-ddcb-35bc-4e97" type="rule"/>
         <infoLink id="33a4-294c-dd98-e424" name="Devil’s Own Luck�" hidden="false" targetId="da8d-c041-fd15-a8de" type="rule"/>
         <infoLink id="c8fb-8f98-c3fc-5881" name="Giant Slayer�" hidden="false" targetId="0d99-00ae-4c22-20b7" type="rule"/>
       </infoLinks>
@@ -9113,12 +9123,12 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
             <modifier type="set" field="name" value="HMS Phaeton"/>
           </modifiers>
         </infoLink>
-        <infoLink id="3fa3-f984-a146-4269" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
-        <infoLink id="599c-21f6-ff51-219f" name="Heavy Firepower" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="4997-6021-2c8d-88c5" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="e057-5632-5e1d-5a1a" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="2c67-071d-1f85-c92f" name="Reliable Design" hidden="false" targetId="6f17-ddcb-35bc-4e97" type="rule"/>
-        <infoLink id="469b-289e-4506-11eb" name="Torpedo Master-Calculator" hidden="false" targetId="d7bf-054e-82a4-bec0" type="rule"/>
+        <infoLink id="3fa3-f984-a146-4269" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="599c-21f6-ff51-219f" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="4997-6021-2c8d-88c5" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="e057-5632-5e1d-5a1a" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="2c67-071d-1f85-c92f" name="Reliable Design�" hidden="false" targetId="6f17-ddcb-35bc-4e97" type="rule"/>
+        <infoLink id="469b-289e-4506-11eb" name="Torpedo Master-Calculator�" hidden="false" targetId="d7bf-054e-82a4-bec0" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="ac66-8202-4e5a-2d74" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -9127,61 +9137,35 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </categoryLinks>
       <entryLinks>
         <entryLink id="67e4-a290-325c-14fc" name="Heavy Prow Ram" hidden="false" collective="false" import="true" targetId="3b69-5936-2ff8-bc08" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6396-0964-e917-96ad" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8f24-904a-27e8-ae56" type="max"/>
-          </constraints>
+          <modifiers>
+            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+          </modifiers>
         </entryLink>
-        <entryLink id="a786-8ed2-b4b4-6d66" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="110e-749a-0199-27be" type="selectionEntry">
+        <entryLink id="a786-8ed2-b4b4-6d66" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0457-cb64-e0ac-63a0" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3ee5-f8e9-c9ac-b15c" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="c4db-69f3-1c31-b3c5" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="afdf-638b-b414-4cd4" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9232-f171-171a-7364" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="0957-c848-7d77-8388" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="0957-c848-7d77-8388" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5935-bcd7-b498-5f40"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4802-78c1-f1d8-4f46" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="036f-26e2-c8fa-430e" type="min"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="202c-3cb5-a64b-91f7" name="Trident generator" hidden="false" collective="false" import="true" targetId="4f9f-bf12-daca-15ed" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0e7e-5ab4-0e58-9eef" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="86c8-cde2-fbd9-1a1d" type="max"/>
-          </constraints>
         </entryLink>
+        <entryLink id="202c-3cb5-a64b-91f7" name="Trident generator" hidden="false" collective="false" import="true" targetId="33c4-9a5e-db6d-b083" type="selectionEntry"/>
         <entryLink id="09c5-5ac9-9541-ec02" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0145-95c3-7bd7-8d53" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f098-7166-50be-64f6" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="2530-3c59-8f61-9a58" name="Heavy Torpedo Turret" hidden="false" collective="false" import="true" targetId="26a3-cf78-63bd-dd6b" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="53db-e16c-e058-bd9d" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4f08-e11c-7b06-8b09" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -9201,15 +9185,14 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
             <modifier type="set" field="name" value="HMCS Saskatchewan"/>
           </modifiers>
         </infoLink>
-        <infoLink id="23fe-ab85-7d23-547a" name="Loyal She Began; Thus She Remains" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
-        <infoLink id="e362-439a-3e05-18f0" name="Combat Air Patrol*" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
-        <infoLink id="a374-fa18-3e17-73a2" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="1381-2218-a47f-b308" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="d438-d5d9-5555-041c" name="SRS Mine Clearance" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
-        <infoLink id="0c67-fe69-454e-0eae" name="SRS Recon Flight" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
-        <infoLink id="2896-1fbc-8e06-13d2" name="Heavy Firepower*" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="23fe-ab85-7d23-547a" name="Loyal She Began; Thus She Remains�" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
+        <infoLink id="a374-fa18-3e17-73a2" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="1381-2218-a47f-b308" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="d438-d5d9-5555-041c" name="SRS Mine Clearance�" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
+        <infoLink id="0c67-fe69-454e-0eae" name="SRS Recon�" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
+        <infoLink id="2896-1fbc-8e06-13d2" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
         <infoLink id="fc17-157a-31b8-0fed" name="Vulnerable Stern�" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
-        <infoLink id="3291-f6c6-0967-b36d" name="Unexpected Air Strike�" hidden="false" targetId="db2e-417f-31d3-8909" type="rule"/>
+        <infoLink id="8717-1e9d-825b-bd34" name="Unexpected Air Strike�" hidden="false" targetId="db2e-417f-31d3-8909" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="5a1c-5197-4ada-2e99" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -9236,64 +9219,32 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
             <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
-        <selectionEntry id="d767-5504-ffe4-3fd1" name="Unexpected Air Strike" hidden="false" collective="false" import="true" type="upgrade">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a3c9-ab1b-8edc-e2a5" type="max"/>
-          </constraints>
-          <infoLinks>
-            <infoLink id="2f9d-c6ae-bc7b-e734" name="Unexpected Air Strike" hidden="false" targetId="db2e-417f-31d3-8909" type="rule"/>
-          </infoLinks>
-          <costs>
-            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
-            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-          </costs>
-        </selectionEntry>
       </selectionEntries>
       <entryLinks>
-        <entryLink id="4ca8-6b28-a891-623f" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="4ca8-6b28-a891-623f" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="8901-cc02-f55e-2ee5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="00f9-6958-1087-f33f" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4358-e3fc-a93b-55d5" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="a10a-d5bd-dcd3-923b" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b80d-8584-ea1b-3691" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="64e4-4d97-0b3c-f9ba" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="01df-3162-3765-b5c2" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a547-de3a-d5e7-b5ce" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="96a6-da4d-a65f-4265" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="475e-632b-904d-3937" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="aabc-38be-99af-5aea" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6b1c-c29d-0fef-0ce7" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="e7ae-7266-dcd9-4646" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5888-87ac-f851-165d"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3e7f-5eef-facb-a08b" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ab47-0724-2c1a-6693" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -9313,15 +9264,14 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
             <modifier type="set" field="name" value="HMCS Tilloch Galt"/>
           </modifiers>
         </infoLink>
-        <infoLink id="25b7-d3a3-8857-c752" name="Heavy Firepower" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="34ba-78fa-b04c-6cbb" name="Inspirational" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
-        <infoLink id="7e5c-1c4f-105f-9b70" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="db1d-14ee-bf5e-e936" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="302a-28c8-cc12-f4b0" name="Guardian Surge" hidden="false" targetId="25ea-b812-952e-dd7d" type="rule"/>
-        <infoLink id="8588-2972-fc80-695d" name="Ablative Prow Armour" hidden="false" targetId="2823-33a9-a62b-e29a" type="rule"/>
-        <infoLink id="ba2d-11b3-bb49-15df" name="Loyal She Began; Thus She Remains" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
-        <infoLink id="9629-bfdc-fc56-2978" name="Vulnerable Stern" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
-        <infoLink id="69e4-16b0-8c59-ebba" name="Command Codes" hidden="false" targetId="1c64-d581-925a-6659" type="rule"/>
+        <infoLink id="25b7-d3a3-8857-c752" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="34ba-78fa-b04c-6cbb" name="Inspirational�" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
+        <infoLink id="7e5c-1c4f-105f-9b70" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="db1d-14ee-bf5e-e936" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="302a-28c8-cc12-f4b0" name="Guardian Surge�" hidden="false" targetId="25ea-b812-952e-dd7d" type="rule"/>
+        <infoLink id="8588-2972-fc80-695d" name="Ablative Prow Armour�" hidden="false" targetId="2823-33a9-a62b-e29a" type="rule"/>
+        <infoLink id="ba2d-11b3-bb49-15df" name="Loyal She Began; Thus She Remains�" hidden="false" targetId="4e23-608b-4365-8b65" type="rule"/>
+        <infoLink id="9629-bfdc-fc56-2978" name="Vulnerable Stern�" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="25cc-5bfd-ba08-5513" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
@@ -9330,30 +9280,21 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </categoryLinks>
       <entryLinks>
         <entryLink id="4181-80bd-ce25-25ad" name="Heavy Prow Ram" hidden="false" collective="false" import="true" targetId="3b69-5936-2ff8-bc08" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d854-5f97-8f49-a539" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2b48-5ebf-f1b1-2ba1" type="max"/>
-          </constraints>
+          <modifiers>
+            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+          </modifiers>
         </entryLink>
-        <entryLink id="a401-8fab-1271-99b5" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="110e-749a-0199-27be" type="selectionEntry">
+        <entryLink id="a401-8fab-1271-99b5" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5708-b45b-95a2-a124" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="395f-fb8d-6fac-7b85" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="1d89-bff7-e650-3aae" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f255-8851-1642-0709" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c36f-1950-3706-5ca9" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="5d35-bfcd-27ef-4212" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="5d35-bfcd-27ef-4212" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="967e-22a1-ae69-7b4f"/>
           </modifiers>
@@ -9362,17 +9303,17 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="219a-7b2f-3eaf-e515" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="1610-c504-fd84-f390" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+        <entryLink id="1610-c504-fd84-f390" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
         </entryLink>
-        <entryLink id="86a4-78bc-1938-eec3" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+        <entryLink id="86a4-78bc-1938-eec3" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
         </entryLink>
-        <entryLink id="44c4-26d1-d1e7-dd6f" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+        <entryLink id="44c4-26d1-d1e7-dd6f" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
           </modifiers>
@@ -9394,7 +9335,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <infoLink id="053d-fcfc-49c9-1b87" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
         <infoLink id="8238-3f63-3c4d-a296" name="Infrasound Detector�" hidden="false" targetId="84f6-ec74-541c-ffd7" type="rule"/>
         <infoLink id="2463-446b-7545-e4af" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="6850-ac18-b01b-7b18" name="Auspicio Regina*" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
+        <infoLink id="6850-ac18-b01b-7b18" name="Auspicio Regina�" hidden="false" targetId="f8e2-882b-f962-2997" type="rule"/>
         <infoLink id="96f9-2b83-33c8-220d" name="East India Privateers�" hidden="false" targetId="d665-7d25-9e6d-2fb7" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -9406,10 +9347,6 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0e84-45a8-dd67-49ff" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4f70-f98b-071a-0617" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="2242-251d-e9ea-f6c5" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
@@ -9424,28 +9361,16 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c53b-fa62-a3cc-e6c8" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d11b-436b-421d-5e4c" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="64dd-ca7c-80c3-959c" name="Canberra Gyro-Bomb Launcher" hidden="false" collective="false" import="true" targetId="558d-7511-d6e9-063d" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="59c6-4f35-f484-3998" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="44cd-3c25-364b-d252" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="e14d-b5d7-11c5-867f" name="Guardian generator" hidden="false" collective="false" import="true" targetId="094a-09c2-c40f-72c2" type="selectionEntry">
+        <entryLink id="e14d-b5d7-11c5-867f" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b786-3c41-3e05-1593" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="973a-0361-d8e1-98f0" type="min"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -9460,11 +9385,11 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="f124-55ec-dced-0b58" name="Guinevere" hidden="false" targetId="e405-c151-4415-ba97" type="profile"/>
-        <infoLink id="d679-adcd-4a7a-2d20" name="Keep Calm and Carry On" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
-        <infoLink id="c86d-99b0-e09f-2c43" name="Lionhearted Crew" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
-        <infoLink id="f3b5-927b-64ee-16d4" name="Royal Engineers" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
-        <infoLink id="803b-9303-3a65-a402" name="Spotter" hidden="false" targetId="063a-3229-1f27-a3c2" type="rule"/>
-        <infoLink id="bf5c-4ad6-be63-b057" name="Unexpected Arrival" hidden="false" targetId="f4aa-042e-34e5-1938" type="rule"/>
+        <infoLink id="d679-adcd-4a7a-2d20" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="c86d-99b0-e09f-2c43" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+        <infoLink id="f3b5-927b-64ee-16d4" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="803b-9303-3a65-a402" name="Spotter�" hidden="false" targetId="063a-3229-1f27-a3c2" type="rule"/>
+        <infoLink id="bf5c-4ad6-be63-b057" name="Unexpected Arrival�" hidden="false" targetId="f4aa-042e-34e5-1938" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="f5af-fa56-285e-7148" name="Strike Submarine" hidden="false" targetId="eaca-b02c-43a7-0b54" primary="false"/>
@@ -9475,29 +9400,325 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bcfb-0a65-dbcb-c7cf" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b182-9cac-bae1-a3dd" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="268e-c22a-28d5-41ea" name="Cymbeline Missile Silo" hidden="false" collective="false" import="true" targetId="7dba-1c8d-ba19-7ccb" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
           </modifiers>
+        </entryLink>
+        <entryLink id="d3de-2d67-5902-d009" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="5888-87ac-f851-165d"/>
+          </modifiers>
+        </entryLink>
+      </entryLinks>
+      <costs>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="80.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+      </costs>
+    </selectionEntry>
+    <selectionEntry id="e47c-54f3-3eb8-82b4" name="Windsor" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="model">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5358-bed2-87aa-bcd4" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2291-5ecb-bc32-4bef" type="max"/>
+      </constraints>
+      <infoLinks>
+        <infoLink id="cec2-6cae-34ee-ee6f" name="Forward Deployment�" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
+        <infoLink id="3282-b155-3252-c03f" name="Heavy Escort�" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
+        <infoLink id="411d-8351-b94c-6074" name="Keep Calm and Carry On�" hidden="false" targetId="592e-f786-82c0-385e" type="rule"/>
+        <infoLink id="2493-b822-4ec0-5225" name="Windsor" hidden="false" targetId="df5c-6718-483d-a416" type="profile"/>
+        <infoLink id="cfe5-aa73-b675-4a4d" name="Immobile�" hidden="false" targetId="8aa1-f648-12bd-a1c6" type="rule"/>
+        <infoLink id="53c7-0f64-f041-e91e" name="Rotational Mount�" hidden="false" targetId="9340-6761-3544-4b29" type="rule"/>
+        <infoLink id="1036-d430-7ca3-1b60" name="Royal Engineers�" hidden="false" targetId="563e-1c6c-a525-6552" type="rule"/>
+        <infoLink id="81ed-be86-4249-827f" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="b473-773b-dbcd-767d" name="Lionhearted Crew�" hidden="false" targetId="20dc-3eb1-0ca3-5a54" type="rule"/>
+      </infoLinks>
+      <categoryLinks>
+        <categoryLink id="4bbb-e79e-746b-f7cd" name="War Platform" hidden="false" targetId="e036-10f0-615f-6a77" primary="false"/>
+        <categoryLink id="befe-00c8-b63b-779a" name="Crown" hidden="false" targetId="9512-6963-5c9a-e15f" primary="true"/>
+      </categoryLinks>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="0905-2497-2c3c-2c45" name="Secondary Weapon" hidden="false" collective="false" import="true">
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9517-f764-98f9-b0ec" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a2d5-733a-1a57-ecbb" type="max"/>
+            <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="28cc-f762-d817-2da4" type="min"/>
+            <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9eec-d1a0-7697-ea34" type="max"/>
           </constraints>
+          <selectionEntryGroups>
+            <selectionEntryGroup id="1523-471d-987d-35bc" name="Front Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="c36b-fc70-5092-77d6">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c9a2-4ec5-158e-7ec2" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bad4-3dca-f91e-a94d" type="max"/>
+              </constraints>
+              <entryLinks>
+                <entryLink id="eb14-6994-4fab-4999" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9707-fdd2-fe66-11a0" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="c36b-fc70-5092-77d6" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0035-47a4-b74f-ccce" type="max"/>
+                  </constraints>
+                </entryLink>
+                <entryLink id="48c9-4248-ef63-7ac3" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1a69-b6c6-4d7a-0726" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+            <selectionEntryGroup id="dbde-a611-d950-4e0f" name="Rear Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="484a-0494-3be8-9226">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0e8b-614f-cb63-79ef" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cb67-e0c3-2a43-cf80" type="max"/>
+              </constraints>
+              <entryLinks>
+                <entryLink id="df4e-4d44-4893-18da" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5e48-c46c-fd83-a858" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="484a-0494-3be8-9226" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1090-5de7-d0a4-fae2" type="max"/>
+                  </constraints>
+                </entryLink>
+                <entryLink id="e6e3-25b6-d900-a517" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8ccb-ab69-42d2-83a6" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+            <selectionEntryGroup id="1d6f-9d00-f3e3-db37" name="Rear Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="1ee2-50db-063e-d32d">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1f2e-25a1-10aa-be68" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3b50-509e-b03e-5ddc" type="max"/>
+              </constraints>
+              <entryLinks>
+                <entryLink id="05d0-c627-5097-02ec" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="628a-148c-47b0-99ee" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="1ee2-50db-063e-d32d" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9db0-58d8-5ef3-50e3" type="max"/>
+                  </constraints>
+                </entryLink>
+                <entryLink id="1330-2b5b-ca03-f046" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ff44-b61a-a987-2eb3" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+            <selectionEntryGroup id="612d-7d85-7ff9-4d04" name="Front Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="d10b-7d99-95d3-7d77">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5770-1348-f46c-2c89" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6704-065a-fce6-842e" type="max"/>
+              </constraints>
+              <entryLinks>
+                <entryLink id="8317-c8f1-3933-c68a" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7c0d-d5bf-31e3-669f" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="d10b-7d99-95d3-7d77" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b7df-581b-c21c-376b" type="max"/>
+                  </constraints>
+                </entryLink>
+                <entryLink id="4d91-7062-9d0e-a875" name="Torpedo Turret " hidden="false" collective="false" import="true" targetId="68c3-d207-b8e4-5428" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e8de-ffbd-3a12-23a2" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+                  </costs>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+          </selectionEntryGroups>
+        </selectionEntryGroup>
+        <selectionEntryGroup id="cd2c-ed1a-2869-9e2e" name="Ammunition" hidden="false" collective="true" import="true">
+          <constraints>
+            <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c41c-90b3-d9fc-6021" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="032f-cdfc-040c-b375" type="max"/>
+          </constraints>
+          <selectionEntries>
+            <selectionEntry id="21da-5531-4d6c-3d4b" name="Amphion ammuniton" hidden="false" collective="true" import="true" type="upgrade">
+              <modifiers>
+                <modifier type="add" field="category" value="e0b0-935e-c0c6-53c8"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0de3-aef1-55ce-c74a" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="cf13-7757-bdae-52a6" name="Submerged" hidden="true" targetId="4c9f-29cc-d354-a5f9" type="rule"/>
+                <infoLink id="09f8-6fbc-da44-31b6" name="Torpedo" hidden="true" targetId="d673-c4da-202e-fbfc" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="6b55-702c-336a-2791" name="Bananach ammuniton" hidden="false" collective="true" import="true" type="upgrade">
+              <modifiers>
+                <modifier type="add" field="category" value="5e15-d2a9-a54e-3a11"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dd85-9e94-082c-c541" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="2f27-0bea-6a47-03c3" name="Blast" hidden="true" targetId="89d8-2e21-11be-005d" type="rule"/>
+                <infoLink id="e482-f04b-1190-7455" name="Hazardous" hidden="true" targetId="ee84-8367-93d5-8d3f" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="2e3f-0bc5-21f2-44f5" name="Pax ammuniton" hidden="false" collective="true" import="true" type="upgrade">
+              <modifiers>
+                <modifier type="add" field="category" value="d91e-9f01-4d5b-0495"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="35b8-1b46-9233-f038" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="0439-150b-42be-5dda" name="Devastating" hidden="true" targetId="d633-3476-6a40-e860" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+              </costs>
+            </selectionEntry>
+            <selectionEntry id="8cdb-cfc5-baeb-cec7" name="Ripple ammuniton" hidden="false" collective="true" import="true" type="upgrade">
+              <modifiers>
+                <modifier type="add" field="category" value="6679-8b34-dcc1-1137"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c2b0-77e9-cc8e-741d" type="max"/>
+              </constraints>
+              <infoLinks>
+                <infoLink id="fccd-815b-69b3-7f62" name="Sustained" hidden="true" targetId="8615-72cb-cdb5-0b1e" type="rule"/>
+              </infoLinks>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+              </costs>
+            </selectionEntry>
+          </selectionEntries>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
+      <entryLinks>
+        <entryLink id="c1f5-2f1e-cfec-2337" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
+          </modifiers>
+        </entryLink>
+        <entryLink id="0850-f8e4-e285-5073" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="afe0-b5a3-3eac-004f"/>
+          </modifiers>
+        </entryLink>
+        <entryLink id="44e5-b498-8552-800c" name="Guardian generator" hidden="false" collective="false" import="true" targetId="fcc9-c0ad-7380-b6a2" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="0c85-39c7-9145-efeb"/>
+            <modifier type="append" field="name" value=" (1)"/>
+          </modifiers>
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4013-7134-c5bf-468c" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c8ca-9927-87e7-374e" type="min"/>
+          </constraints>
+        </entryLink>
+        <entryLink id="8d6a-d52b-9068-0260" name="Taranis Naval Mortar" hidden="false" collective="false" import="true" targetId="5cc9-461f-b7ef-c0b6" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+          </modifiers>
+        </entryLink>
+        <entryLink id="d76a-853c-2987-fc57" name="Taranis Naval Mortar" hidden="false" collective="false" import="true" targetId="5cc9-461f-b7ef-c0b6" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+          </modifiers>
+        </entryLink>
+        <entryLink id="85f0-1c29-7564-0434" name="Taranis Naval Mortar" hidden="false" collective="false" import="true" targetId="5cc9-461f-b7ef-c0b6" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+          </modifiers>
+        </entryLink>
+        <entryLink id="32fa-0ab2-b5d2-d92d" name="Taranis Naval Mortar" hidden="false" collective="false" import="true" targetId="5cc9-461f-b7ef-c0b6" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+          </modifiers>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="80.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="285.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
   </sharedSelectionEntries>
   <sharedRules>
-    <rule id="20dc-3eb1-0ca3-5a54" name="Lionhearted Crew�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="20dc-3eb1-0ca3-5a54" name="Lionhearted Crew (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -9511,7 +9732,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </modifiers>
       <description>Crippled Models with this rule still use the Battle Ready value of their weapons with the Gunnery Quality and may re-roll Blank Results when making or the Initial Target of an Assault. This rule cannot be used if the Model has the Chaos and Disarray Disorder Condition.</description>
     </rule>
-    <rule id="592e-f786-82c0-385e" name="Keep Calm and Carry On�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="592e-f786-82c0-385e" name="Keep Calm and Carry On (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -9526,7 +9747,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </modifiers>
       <description>This Unit treats the effects of Chaos and Disarray as the effects of Emergency instead. The Units still counts has having the Chaos and Disarray Level so receiving a further Disorder Condition causes damage as normal. Furthermore, in a Ramming Action this Model does not suffer from Disorder. As the Moving Model in a Ramming Action, this Model also does not suffer from Damage.</description>
     </rule>
-    <rule id="4e23-608b-4365-8b65" name="Loyal She Began; Thus She Remains�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="4e23-608b-4365-8b65" name="Loyal She Began; Thus She Remains (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -9540,7 +9761,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </modifiers>
       <description>This Model may add +2 to its Defence Action Dice Pool if it is within 10” of one or more other friendly Units with the CROWN Trait.</description>
     </rule>
-    <rule id="f8e2-882b-f962-2997" name="Auspicio Regina�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="f8e2-882b-f962-2997" name="Auspicio Regina (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -9555,7 +9776,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </modifiers>
       <description>After a Force with this Unit in play uses a card to score a Victory Condition, roll an Action Die. On an Exploding Hit, do not discard the Victory &amp; Valour card and instead return it to your hand. You may only roll once per card and cannot play a returned card immediately to score additional points.</description>
     </rule>
-    <rule id="d665-7d25-9e6d-2fb7" name="East India Privateers�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="d665-7d25-9e6d-2fb7" name="East India Privateers" publicationId="dbca-8d57-b848-457e" hidden="false">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
diff --git a/Empire.cat b/Empire.cat
index 68a49a1..440fbd3 100644
--- a/Empire.cat
+++ b/Empire.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="adb2-8c90-0724-a27d" name="Empire v3.03" revision="9" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="8" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="adb2-8c90-0724-a27d" name="Empire v3.03" revision="9" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <comment>Last Empire ORBAT 3.03 (published 07/02/2023)</comment>
   <readme>Review 1.02.a0: Initial release
 Review 1.04.a0: add new unit and new profile from ORBAT 1.03, fixed Battlefleet bonus managment
@@ -656,6 +656,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="eee4-7e80-66db-00bf" name="Wusong Monitor Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -681,6 +682,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9375-7b03-30ae-e330" name="Tianlong Draconic Colossus Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -690,7 +692,6 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
             <conditionGroup type="or">
               <conditions>
                 <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="9180-7cd0-dc74-7a74" type="instanceOf"/>
-                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="773e-b1de-0f86-fbc2" type="instanceOf"/>
               </conditions>
             </conditionGroup>
           </conditionGroups>
@@ -707,6 +708,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f9fb-28fc-c4a4-7ece" name="Shanghai Frigate Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -734,6 +736,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="26a8-5c00-bf08-2e9e" name="Osaka Line Cruiser Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -782,6 +785,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c7a8-b4ec-1ae3-ce93" name="Okinawa  Reconnaissance Cruiser Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -825,6 +829,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f12b-8674-3d4c-2885" name="Miyagi Scout Carrier Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -868,6 +873,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="478b-517b-22ef-4a03" name="Meru Heavy Cruiser Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -894,6 +900,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ee90-db9c-b828-97a3" name="Kyoto Frigate Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -937,6 +944,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c82f-aa2a-22f0-80a4" name="Kanagawa Monitor Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -980,6 +988,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="8849-0d3c-231a-d6cb" name="Jian Cruiser Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -1006,6 +1015,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="1c60-3a7e-e5d3-dd3c" name="Ishikawa Strike Cruiser Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -1049,6 +1059,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d2e1-74cb-3d88-f95a" name="Honshu Light Cruiser Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -1092,6 +1103,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="b13b-2b35-31b5-5441" name="Hokkaido Heavy Cruiser Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -1135,6 +1147,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="17fb-1af9-ca10-8def" name="Dao Light Cruiser Squadron" publicationId="7b2b-0f56-3962-5ec1" page="9" hidden="false" collective="false" import="true" type="unit">
@@ -1161,6 +1174,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="24d9-0d1e-56d5-65ef" name="Kongo Heavy Battleship" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -1205,6 +1219,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d845-7637-df9e-7528" name="Hanchiman Assault Carrier" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -1249,6 +1264,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="dd76-9826-ee5b-37f6" name="Yangtze Command Ship" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -1309,6 +1325,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1319,6 +1336,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="92fd-a50d-fc2d-eaaa" name="Keying" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -1383,6 +1401,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1393,6 +1412,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="1a76-cd27-777a-e446" name="Ning Jing Battleship" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -1437,6 +1457,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="6455-d073-9f2a-449e" name="Gong Destroyers Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -1462,6 +1483,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4ce5-4aa2-a8f4-05e8" name="Zhanmadao Sky Fortress" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -1514,6 +1536,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1524,6 +1547,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d80c-03e0-8025-e96f" name="Ziwei Sky Bastion Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -1575,6 +1599,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1585,6 +1610,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4077-91d9-74dc-7768" name="Tianlong Draconic Colossus Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -1614,6 +1640,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="cb3a-8b3e-578b-f689" name="Qianshao Sky Keep Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -1664,6 +1691,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1674,6 +1702,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c684-2360-ff83-280f" name="Umibozu SubmersibleAssault Ship Squadron" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="unit">
@@ -1699,6 +1728,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="a3bb-327e-fd3b-56d2" name="Ryujin Attack Submarine Squadron" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="unit">
@@ -1724,6 +1754,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="908d-8bfe-5ced-a907" name="Ofukoro Ika Colossus Squadron" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="unit">
@@ -1766,6 +1797,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3762-80fc-fca5-0402" name="Mizuchi Submersible Exosub Carrier Squadron" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="unit">
@@ -1791,6 +1823,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="2bb8-4d9f-a1e3-cffe" name="Koromodako Submersible Strike Ship Squadron" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="unit">
@@ -1815,7 +1848,8 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
         <entryLink id="9f18-95f3-81b1-e860" name="Koromodako" hidden="false" collective="false" import="true" targetId="63cf-5d01-0278-9962" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9ca4-2b76-b3a3-5e1a" name="Kansai Battle Submarine Squadron" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="unit">
@@ -1841,6 +1875,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="63b3-b1cf-8607-6e85" name="Kaiju Ika Colossus Squadron" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="unit">
@@ -1884,6 +1919,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="05c1-531c-9acd-423b" name="Kagutsuchi Submersible Attack Ship Squadron" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="unit">
@@ -1909,6 +1945,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3824-3881-27e9-aa3a" name="Chubu Hunter Submarines Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1934,6 +1971,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="a161-b8cd-3bcc-0137" name="Sakata Heavy Destroyers Squadron" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="unit">
@@ -1976,6 +2014,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f16a-e9db-78ac-2a9d" name="Matsumoto Generator Ship" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -2020,6 +2059,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="2a4b-8e0d-7489-fd16" name="Akita Super Battleship" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -2064,6 +2104,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="05d8-02e5-f5d6-d81d" name="Ergun Assault Battleship" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -2123,6 +2164,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2133,6 +2175,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ca71-7e17-a9b6-9f0f" name="Heilong Strike Battleship" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -2192,6 +2235,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2202,6 +2246,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="03b8-147a-9d3f-0b19" name="Barangao Battle Platforms" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="unit">
@@ -2247,6 +2292,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="7f7c-36e7-a095-5475" name="Magwayen Offshore Support Platforms" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="upgrade">
@@ -2292,6 +2338,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="a886-93b6-4d7a-5677" name="Malandok War Platforms" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="upgrade">
@@ -2337,6 +2384,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="458c-0dbf-aab8-e9b8" name="Shinzua Nyoi" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -2381,6 +2429,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4deb-1584-a19d-41ae" name="Oni" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -2425,6 +2474,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
   </selectionEntries>
@@ -2637,6 +2687,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="235.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ea2f-b751-305e-ebb0" name="Keying" publicationId="7b2b-0f56-3962-5ec1" page="5" hidden="false" collective="false" import="true" type="model">
@@ -2726,6 +2777,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="245.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0a1e-834f-b027-4154" name="Yangtze" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -2910,6 +2962,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="270.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="8ae5-e86b-033b-7340" name="Hachiman" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -2950,6 +3003,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -3027,6 +3081,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="291.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c11e-e5f5-550c-3ab2" name="Kongo" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -3234,6 +3289,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="265.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d5b5-5e74-380f-bd53" name="Dao" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -3410,6 +3466,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="82.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="64fe-3780-ce48-39bd" name="Gong" publicationId="7b2b-0f56-3962-5ec1" page="9" hidden="false" collective="false" import="true" type="model">
@@ -3515,6 +3572,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="40.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="26e6-5a5a-942b-dcec" name="Hokkaido" publicationId="7b2b-0f56-3962-5ec1" page="10" hidden="false" collective="false" import="true" type="model">
@@ -3709,6 +3767,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="125.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9b6e-455d-e496-c263" name="Honshu" publicationId="7b2b-0f56-3962-5ec1" page="10" hidden="false" collective="false" import="true" type="model">
@@ -3870,6 +3929,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="93.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3071-584c-bd3e-2267" name="Ishikawa" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -4023,6 +4083,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="110.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c47f-db2e-0cb4-52c7" name="Jian" publicationId="7b2b-0f56-3962-5ec1" page="11" hidden="false" collective="false" import="true" type="model">
@@ -4203,6 +4264,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="95.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="e184-b66b-3b17-7f30" name="Kanagawa" publicationId="7b2b-0f56-3962-5ec1" page="12" hidden="false" collective="false" import="true" type="model">
@@ -4355,6 +4417,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="90.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="6508-c236-4649-132d" name="Kyoto" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -4394,6 +4457,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="28.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="b9ed-ea4d-3605-bd8f" name="Meru" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -4596,6 +4660,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="132.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="dd96-b4cf-ea4b-bdf5" name="Miyagi" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -4631,6 +4696,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -4768,6 +4834,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="120.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="28f3-094e-e25e-9ab3" name="Okinawa" publicationId="7b2b-0f56-3962-5ec1" page="14" hidden="false" collective="false" import="true" type="model">
@@ -4803,6 +4870,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -4968,6 +5036,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="140.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="83d3-7088-b8ee-102c" name="Osaka" publicationId="7b2b-0f56-3962-5ec1" page="15" hidden="false" collective="false" import="true" type="model">
@@ -5148,6 +5217,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="105.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="59c2-0b35-1f46-afa9" name="Shanghai" publicationId="7b2b-0f56-3962-5ec1" page="15" hidden="false" collective="false" import="true" type="model">
@@ -5204,6 +5274,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="30.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="306f-c7b2-ca4f-e62a" name="Tianlong" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -5236,20 +5307,24 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
         <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8ab9-195c-4b32-5c7d" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="92bf-dc11-8bff-db7d" name="Secondary Strike" hidden="false" targetId="1b1c-3753-9c1c-562b" type="rule">
+        <infoLink id="a26e-287b-e36f-4f18" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="72d7-8951-2ac8-531f" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="7410-f521-1323-1c4a" name="Scything Strike (3.04)" hidden="false" targetId="d2f1-7efd-6678-9003" type="rule">
           <modifiers>
-            <modifier type="append" field="name" value=" (Scything Blades)"/>
+            <modifier type="set" field="hidden" value="true">
+              <conditions>
+                <condition field="selections" scope="306f-c7b2-ca4f-e62a" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="03ef-7fbb-659e-776e" type="equalTo"/>
+              </conditions>
+            </modifier>
           </modifiers>
         </infoLink>
-        <infoLink id="a26e-287b-e36f-4f18" name="Alchemical Conflagration" hidden="false" targetId="9816-51d2-6c9c-d6e3" type="rule"/>
-        <infoLink id="72d7-8951-2ac8-531f" name="Shadow Hunter" hidden="false" targetId="741b-a6ce-dbe7-9409" type="rule"/>
-        <infoLink id="7410-f521-1323-1c4a" name="Vanguard" hidden="false" targetId="f721-8318-3875-0140" type="rule"/>
-        <infoLink id="b29d-b22b-657f-bc73" name="The Mark of Yama" hidden="false" targetId="ae1a-2537-27f6-15ce" type="rule"/>
+        <infoLink id="b29d-b22b-657f-bc73" name="Mark of Yama (3.04)" hidden="false" targetId="ae1a-2537-27f6-15ce" type="rule"/>
         <infoLink id="0695-06aa-28f9-1da1" name="Tianlong" hidden="false" targetId="5499-f44e-7e2e-a6af" type="profile"/>
-        <infoLink id="91ff-a27a-6d2b-53ed" name="Colossus" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
-        <infoLink id="a1a9-f5be-0261-8301" name="Low Level Strike" hidden="false" targetId="0054-ea91-5408-283a" type="rule"/>
-        <infoLink id="ed81-f16b-bf4b-480b" name="Terror From Above" hidden="false" targetId="eabd-7cf1-b305-2fdb" type="rule"/>
-        <infoLink id="fd6d-75ff-8ec7-11dd" name="Vulnerable Stern" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="91ff-a27a-6d2b-53ed" name="Cloud Dive (3.04)" hidden="false" targetId="52c5-a8f6-6309-f95c" type="rule"/>
+        <infoLink id="a1a9-f5be-0261-8301" name="Low-Level Strike (3.04)" hidden="false" targetId="0054-ea91-5408-283a" type="rule"/>
+        <infoLink id="ed81-f16b-bf4b-480b" name="Terror From Above (3.04)" hidden="false" targetId="eabd-7cf1-b305-2fdb" type="rule"/>
+        <infoLink id="fb31-9da8-c45d-33d2" name="Alchemical Conflagration (3.04)" hidden="false" targetId="9816-51d2-6c9c-d6e3" type="rule"/>
+        <infoLink id="94e3-cd60-da0b-0e97" name="Colossus (3.04)" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="b821-8163-5c08-2407" name="Chinese" hidden="false" targetId="0ad5-d3e2-dc61-f333" primary="false"/>
@@ -5257,7 +5332,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
         <categoryLink id="6035-4f56-397c-9519" name="Empire" hidden="false" targetId="ce97-a91c-c2c9-c566" primary="true"/>
       </categoryLinks>
       <selectionEntryGroups>
-        <selectionEntryGroup id="a238-14a8-9be5-f9fe" name="Secondary Weapon" page="" hidden="false" collective="false" import="true" defaultSelectionEntryId="6791-7bcc-619c-2e67">
+        <selectionEntryGroup id="a238-14a8-9be5-f9fe" name="Front Weapon" page="" hidden="false" collective="false" import="true" defaultSelectionEntryId="6791-7bcc-619c-2e67">
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fe8e-05a6-42fa-b94c" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="935c-34be-7857-05cf" type="max"/>
@@ -5281,14 +5356,14 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
             </entryLink>
           </entryLinks>
         </selectionEntryGroup>
-        <selectionEntryGroup id="7b3f-c3d7-bc0a-b47a" name="Tail Weapon" publicationId="e265-8c7f-a4b2-a48e" page="4" hidden="false" collective="false" import="true" defaultSelectionEntryId="083e-2ad4-b6be-b9e3">
+        <selectionEntryGroup id="7b3f-c3d7-bc0a-b47a" name="Tail Weapon" page="" hidden="false" collective="false" import="true" defaultSelectionEntryId="03ef-7fbb-659e-776e">
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="523d-91f5-78ff-47fe" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2092-728c-0f76-4d15" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="03ef-7fbb-659e-776e" name="Heat Lancette" hidden="false" collective="false" import="true" targetId="4688-bbd1-6ac5-f438" type="selectionEntry">
               <modifiers>
-                <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
               </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3880-e273-53ad-6bae" type="max"/>
@@ -5297,14 +5372,6 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
               </costs>
             </entryLink>
-            <entryLink id="083e-2ad4-b6be-b9e3" name="Scything Blades" hidden="false" collective="false" import="true" targetId="3b8a-f050-dfb4-04fe" type="selectionEntry">
-              <modifiers>
-                <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
-              </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1081-b118-df90-7dd9" type="max"/>
-              </constraints>
-            </entryLink>
           </entryLinks>
         </selectionEntryGroup>
         <selectionEntryGroup id="6049-6cb4-f645-71ae" name="Main Weapon" hidden="false" collective="false" import="true">
@@ -5368,11 +5435,6 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                         <condition field="selections" scope="306f-c7b2-ca4f-e62a" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="6074-770f-d87b-b41f" type="instanceOf"/>
                       </conditions>
                     </modifier>
-                    <modifier type="set" field="2e1e-211c-1154-ba86" value="1.0">
-                      <conditions>
-                        <condition field="selections" scope="306f-c7b2-ca4f-e62a" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="6074-770f-d87b-b41f" type="instanceOf"/>
-                      </conditions>
-                    </modifier>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2e1e-211c-1154-ba86" type="min"/>
@@ -5387,6 +5449,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                   </infoLinks>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                    <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -5416,7 +5479,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="9c94-0b39-6bfc-4bbe" name="Japanese" hidden="false" collective="true" import="true" targetId="7cc0-2b68-0e15-724f" type="selectionEntry">
+        <entryLink id="9c94-0b39-6bfc-4bbe" name="Japanese" hidden="false" collective="false" import="true" targetId="7cc0-2b68-0e15-724f" type="selectionEntry">
           <modifiers>
             <modifier type="set" field="5938-bbe1-2c17-a36a" value="1.0">
               <conditionGroups>
@@ -5434,16 +5497,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" id="c89c-f7c1-ff3f-4642" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="2dda-7a1a-f65a-6ada" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
-          <modifiers>
-            <modifier type="set" field="name" value="Internal Shorud generato"/>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7e4a-e066-1b38-99e8" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eace-3195-0ff7-58b5" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="ce15-5338-4385-5fc6" name="Claw Arc Projector" hidden="false" collective="false" import="true" targetId="6d90-2426-1b3b-27f6" type="selectionEntry">
+        <entryLink id="ce15-5338-4385-5fc6" name="Claw Arc Projector" hidden="false" collective="false" import="true" targetId="62a4-b440-678e-256f" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
@@ -5454,7 +5508,8 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="141.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="146.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="5d1f-ce40-d0ec-ae07" name="Wusong" publicationId="7b2b-0f56-3962-5ec1" page="17" hidden="false" collective="false" import="true" type="model">
@@ -5613,6 +5668,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="75.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="711b-3910-f8cb-2761" name="Yamaguchi" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -5794,6 +5850,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="130.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ba9a-63e8-031a-a5c2" name="Zhanmadao" publicationId="7b2b-0f56-3962-5ec1" page="6" hidden="false" collective="false" import="true" type="unit">
@@ -5855,6 +5912,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="acfc-eaf4-2feb-a830" name="Bushi Ryu Dojo" hidden="true" collective="false" import="true" type="upgrade">
@@ -5887,6 +5945,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -6175,6 +6234,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="545.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="27e6-c65d-77cf-f999" name="Ziwei" page="" hidden="false" collective="false" import="true" type="unit">
@@ -6202,13 +6262,13 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </constraints>
       <infoLinks>
         <infoLink id="8f02-0dfa-5cc9-e19d" name="Ziwei" hidden="false" targetId="da81-7592-9d3b-0602" type="profile"/>
-        <infoLink id="f8ee-23cb-ef67-86cf" name="Lumbering" hidden="false" targetId="6b55-0f21-5c85-94cb" type="rule"/>
+        <infoLink id="f8ee-23cb-ef67-86cf" name="Lumbering (3.04)" hidden="false" targetId="6b55-0f21-5c85-94cb" type="rule"/>
         <infoLink id="1d21-c824-4031-4250" name="Flak Barrage" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
             <modifier type="append" field="name" value=" (5)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="7eb7-57b1-595e-0eba" name="The Mark of Yama" hidden="false" targetId="ae1a-2537-27f6-15ce" type="rule"/>
+        <infoLink id="7eb7-57b1-595e-0eba" name="Mark of Yama (3.04)" hidden="false" targetId="ae1a-2537-27f6-15ce" type="rule"/>
         <infoLink id="561a-fc35-a133-73e1" name="Decentralised Systems" hidden="false" targetId="904b-b97c-9150-5ada" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -6236,7 +6296,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e52a-2aad-a3d0-4e24" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="612c-65ce-81c5-9a24" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry">
@@ -6244,7 +6304,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d36a-6c0e-08cf-1260" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="1b09-b47d-5f0b-9608" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry">
@@ -6252,7 +6312,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ef57-8e98-a511-2ce0" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="cdf2-fb81-cd6c-f1ca" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
@@ -6260,7 +6320,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0c66-1e81-7dda-f9f1" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="51a2-67cb-ebac-2f03" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
@@ -6268,7 +6328,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fa13-7358-ea3b-b0df" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="8247-f3fb-55be-d31e" name="Interphase generator" hidden="false" collective="false" import="true" targetId="efe5-f7a5-d52e-0c9e" type="selectionEntry">
@@ -6276,7 +6336,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e750-e2f8-2059-ba5a" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="9e6c-fe3c-6923-1cd2" name="Atomic generator" hidden="false" collective="false" import="true" targetId="eef0-442d-aa6f-b314" type="selectionEntry">
@@ -6284,12 +6344,12 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fe93-85b6-af92-b006" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="a329-3ad5-cf0b-61a3" name="Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="0e98-ee1b-ca55-0e18">
+            <selectionEntryGroup id="a329-3ad5-cf0b-61a3" name="Battery" hidden="false" collective="false" import="true" defaultSelectionEntryId="0e98-ee1b-ca55-0e18">
               <modifiers>
                 <modifier type="set" field="dee9-2ea0-8102-fb38" value="0.0">
                   <conditions>
@@ -6328,6 +6388,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                   </infoLinks>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                    <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -6372,7 +6433,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b8f9-fa1f-3999-4f87" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="9fc5-14a2-9b95-6644" name="Heavy Huoqiang" hidden="false" collective="false" import="true" targetId="58b1-5a36-1519-e457" type="selectionEntry">
+                <entryLink id="9fc5-14a2-9b95-6644" name="Huoqiang" hidden="false" collective="false" import="true" targetId="e3e7-988d-2dc9-694e" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="afe0-b5a3-3eac-004f"/>
                   </modifiers>
@@ -6399,7 +6460,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="99d7-a3e2-0bd1-be48" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="e702-3d69-b8eb-5437" name="Heavy Huoqiang" hidden="false" collective="false" import="true" targetId="58b1-5a36-1519-e457" type="selectionEntry">
+                <entryLink id="e702-3d69-b8eb-5437" name="Huoqiang" hidden="false" collective="false" import="true" targetId="e3e7-988d-2dc9-694e" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
                   </modifiers>
@@ -6438,14 +6499,11 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
           <modifiers>
             <modifier type="add" field="category" value="5888-87ac-f851-165d"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="02e3-c368-cf5e-27ab" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7c6a-5bdc-3ed1-262b" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="135.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="128.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0143-d465-729b-2288" name="Chita" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -6455,6 +6513,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </infoLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="7cc0-2b68-0e15-724f" name="Japanese" hidden="false" collective="true" import="true" type="upgrade">
@@ -6464,6 +6523,7 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </modifiers>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="75cb-cdcc-b759-f057" name="Qianshao" hidden="false" collective="false" import="true" type="model">
@@ -6490,15 +6550,15 @@ Review 3.03.04: correction after the 3.03 Orbat update (date 2023-02-07)</readme
       </constraints>
       <infoLinks>
         <infoLink id="5b8f-ee39-4ec6-8c6f" name="Qianshao" hidden="false" targetId="832a-2786-9a33-049b" type="profile"/>
-        <infoLink id="0a67-8d12-b931-9e17" name="Lumbering" hidden="false" targetId="6b55-0f21-5c85-94cb" type="rule"/>
-        <infoLink id="7709-342b-3962-9e0f" name="Decentralised Systems" hidden="false" targetId="904b-b97c-9150-5ada" type="rule"/>
-        <infoLink id="105b-e87e-8bac-31cb" name="Combat Air Patrol" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
-        <infoLink id="86de-c4f7-f742-a988" name="Flak Barrage" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
+        <infoLink id="0a67-8d12-b931-9e17" name="Lumbering (3.04)" hidden="false" targetId="6b55-0f21-5c85-94cb" type="rule"/>
+        <infoLink id="7709-342b-3962-9e0f" name="Decentralised Systems (3.04)" hidden="false" targetId="904b-b97c-9150-5ada" type="rule"/>
+        <infoLink id="105b-e87e-8bac-31cb" name="Combat Air Patrol (3.04)" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
+        <infoLink id="86de-c4f7-f742-a988" name="Flak Barrage (3.04)" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
             <modifier type="append" field="name" value=" (4)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="a848-bac9-d932-2cb1" name="The Mark of Yama" hidden="false" targetId="ae1a-2537-27f6-15ce" type="rule"/>
+        <infoLink id="a848-bac9-d932-2cb1" name="Mark of Yama (3.04)" hidden="false" targetId="ae1a-2537-27f6-15ce" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="5ae2-fc85-3917-8e6d" name="Chinese" hidden="false" targetId="0ad5-d3e2-dc61-f333" primary="false"/>
@@ -6523,6 +6583,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -6546,7 +6607,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cd30-7912-b521-e9ff" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="7f73-2466-15ae-c8c7" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry">
@@ -6554,7 +6615,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="79b0-b40c-33b8-d33e" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="957a-a5ca-f622-b9f6" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry">
@@ -6562,7 +6623,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7992-39ce-b272-5060" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="dfb5-063d-d482-c531" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
@@ -6570,7 +6631,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="288a-eb8c-7e42-f975" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="db74-7459-0b33-5f86" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
@@ -6578,7 +6639,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5773-69df-6c61-0f7b" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="aa15-c1bb-671a-eaf3" name="Interphase generator" hidden="false" collective="false" import="true" targetId="efe5-f7a5-d52e-0c9e" type="selectionEntry">
@@ -6586,7 +6647,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f9c9-5d3a-3bf6-ac09" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
                 <entryLink id="b5fc-2da9-db99-1357" name="Atomic generator" hidden="false" collective="false" import="true" targetId="eef0-442d-aa6f-b314" type="selectionEntry">
@@ -6594,12 +6655,12 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="597e-b6ea-f4f9-6d4a" type="max"/>
                   </constraints>
                   <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-10.0"/>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
                   </costs>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="c704-1147-1c68-c012" name="Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="2883-ebe7-d84f-14c9">
+            <selectionEntryGroup id="c704-1147-1c68-c012" name="Battery" hidden="false" collective="false" import="true" defaultSelectionEntryId="2883-ebe7-d84f-14c9">
               <modifiers>
                 <modifier type="set" field="7488-2092-74fd-df37" value="0.0">
                   <conditions>
@@ -6634,6 +6695,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                   </infoLinks>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                    <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -6678,7 +6740,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a1d9-45c7-20db-7031" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="4e2e-a7dc-2217-651b" name="Heavy Huoqiang" hidden="false" collective="false" import="true" targetId="58b1-5a36-1519-e457" type="selectionEntry">
+                <entryLink id="4e2e-a7dc-2217-651b" name="Huoqiang" hidden="false" collective="false" import="true" targetId="e3e7-988d-2dc9-694e" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="afe0-b5a3-3eac-004f"/>
                   </modifiers>
@@ -6705,7 +6767,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d05c-f75d-e68f-4feb" type="max"/>
                   </constraints>
                 </entryLink>
-                <entryLink id="ccd7-f5ae-dee5-c985" name="Heavy Huoqiang" hidden="false" collective="false" import="true" targetId="58b1-5a36-1519-e457" type="selectionEntry">
+                <entryLink id="ccd7-f5ae-dee5-c985" name="Huoqiang" hidden="false" collective="false" import="true" targetId="e3e7-988d-2dc9-694e" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
                   </modifiers>
@@ -6742,7 +6804,8 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="160.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="146.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="7248-6ff4-e69c-c00e" name="Umibozu" hidden="false" collective="false" import="true" type="model">
@@ -6752,9 +6815,11 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="df08-87a6-4a06-4cd3" name="Umibozu" hidden="false" targetId="edae-77d0-f7f6-5977" type="profile"/>
-        <infoLink id="13a1-381a-ce23-25dc" name="Elite Crew" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
-        <infoLink id="e4a1-8b16-da76-22b7" name="Hammer Sweep" hidden="false" targetId="4a79-7f9b-ba17-59b8" type="rule"/>
-        <infoLink id="7210-0ba6-69d4-ca95" name="Terror From Belove" hidden="false" targetId="405a-6e4d-45ad-b188" type="rule"/>
+        <infoLink id="13a1-381a-ce23-25dc" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
+        <infoLink id="e4a1-8b16-da76-22b7" name="Hammer Sweep (3.04)" hidden="false" targetId="4a79-7f9b-ba17-59b8" type="rule"/>
+        <infoLink id="7210-0ba6-69d4-ca95" name="Terror From Belove (3.04)" hidden="false" targetId="405a-6e4d-45ad-b188" type="rule"/>
+        <infoLink id="2472-4233-cf71-d10a" name="Shadow Hunter (3.04)" hidden="false" targetId="741b-a6ce-dbe7-9409" type="rule"/>
+        <infoLink id="343b-bf64-1378-2401" name="Silent Hunter (3.04)" hidden="false" targetId="4073-0c13-d827-7ab1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="4d0e-8df4-6573-9722" name="Empire" hidden="false" targetId="ce97-a91c-c2c9-c566" primary="true"/>
@@ -6765,10 +6830,6 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4409-230f-1cc2-7a83" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6881-60bf-88d2-0b2c" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="c757-3bce-cd87-63ac" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
@@ -6778,6 +6839,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="90.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="530a-5e5d-63d8-35d0" name="Ryujin" hidden="false" collective="false" import="true" type="model">
@@ -6789,7 +6851,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <infoLink id="cb76-8cec-18d7-e293" name="Ryujin" hidden="false" targetId="3df5-7963-0f31-0fa1" type="profile"/>
         <infoLink id="3614-6a0e-d9dd-e9e8" name="Elite Crew" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
         <infoLink id="bd23-259c-b6ca-bd3a" name="Shadow Hunter" hidden="false" targetId="741b-a6ce-dbe7-9409" type="rule"/>
-        <infoLink id="bbb2-db8e-1aa1-d8f7" name="Skyfire" hidden="false" targetId="1083-2af1-7bfc-7a55" type="rule"/>
+        <infoLink id="bbb2-db8e-1aa1-d8f7" name="Skyfire (3.04)" hidden="false" targetId="1083-2af1-7bfc-7a55" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="ad50-0298-b815-ca20" name="Empire" hidden="false" targetId="ce97-a91c-c2c9-c566" primary="true"/>
@@ -6800,23 +6862,16 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8f11-4479-f9e8-f93a" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9936-ed32-21c6-6ef9" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="f460-86b7-f899-cc0f" name="Heavy Alchemical Rockets" hidden="false" collective="false" import="true" targetId="3d0e-d034-a0b1-f724" type="selectionEntry">
           <modifiers>
-            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+            <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2257-4ce1-14d3-243e" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="14e1-bef0-7bf1-1f7f" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="115.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="11e6-3420-81c1-c989" name="Ofukoro" hidden="false" collective="false" import="true" type="model">
@@ -6826,17 +6881,13 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="a22d-75ca-01c9-f289" name="Ofukoro" hidden="false" targetId="dbd9-8fb2-88e6-7a63" type="profile"/>
-        <infoLink id="31be-4563-2b43-4248" name="Mine Sweeper*" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
-        <infoLink id="c295-279a-86f1-b345" name="Mechanical Soul" hidden="false" targetId="a278-bd16-046d-acb6" type="rule"/>
-        <infoLink id="a8b9-a2ff-74c3-1a33" name="Submarauder*" hidden="false" targetId="481e-dcda-510f-f32d" type="rule"/>
-        <infoLink id="542e-90c4-73c9-3bf9" name="Moon Pool" hidden="false" targetId="04b5-f23d-eaad-b786" type="rule"/>
-        <infoLink id="523c-f7cb-6c1c-2f4b" name="Secondary Strike" hidden="false" targetId="1b1c-3753-9c1c-562b" type="rule">
-          <modifiers>
-            <modifier type="append" field="name" value=" (Scything Blades)"/>
-          </modifiers>
-        </infoLink>
-        <infoLink id="e290-e510-6ffe-10dc" name="Shokushu" hidden="false" targetId="21eb-6e97-cfe9-30b0" type="rule"/>
-        <infoLink id="4469-5494-95d9-45f8" name="Colossus" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
+        <infoLink id="31be-4563-2b43-4248" name="Mine Sweeper (3.04)" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
+        <infoLink id="c295-279a-86f1-b345" name="Mechanical Soul (3.04)" hidden="false" targetId="a278-bd16-046d-acb6" type="rule"/>
+        <infoLink id="a8b9-a2ff-74c3-1a33" name="Submarauder (3.04)" hidden="false" targetId="481e-dcda-510f-f32d" type="rule"/>
+        <infoLink id="542e-90c4-73c9-3bf9" name="Moon Pool (3.04)" hidden="false" targetId="04b5-f23d-eaad-b786" type="rule"/>
+        <infoLink id="523c-f7cb-6c1c-2f4b" name="Scything Strike (3.04)" hidden="false" targetId="d2f1-7efd-6678-9003" type="rule"/>
+        <infoLink id="e290-e510-6ffe-10dc" name="Shokushu (3.04)" hidden="false" targetId="21eb-6e97-cfe9-30b0" type="rule"/>
+        <infoLink id="4469-5494-95d9-45f8" name="Colossus (3.04)" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="cec4-2ffa-9715-b326" name="Empire" hidden="false" targetId="ce97-a91c-c2c9-c566" primary="true"/>
@@ -6848,23 +6899,11 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8260-cd0c-a6ba-b509" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f7b2-800f-0e47-17b5" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="ed57-4503-fc19-d403" name="Scything Blades" hidden="false" collective="false" import="true" targetId="7d6e-51f6-d5e5-200b" type="selectionEntry">
-          <modifiers>
-            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d395-0ad6-a181-5941" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1f9f-9fee-02f8-0f70" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="146.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="2f8f-1549-d48f-bdc7" name="Mizuchi" hidden="false" collective="false" import="true" type="model">
@@ -6874,8 +6913,9 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="fe35-dd9a-8825-4f56" name="Mizuchi" hidden="false" targetId="3b0c-1202-ecef-e9ad" type="profile"/>
-        <infoLink id="1a91-fbfc-afc0-6212" name="Elite Crew" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
-        <infoLink id="0e55-5aa0-3caf-c1d1" name="Exosub Mine Clearance" hidden="false" targetId="6d04-40f6-eafc-bf99" type="rule"/>
+        <infoLink id="1a91-fbfc-afc0-6212" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
+        <infoLink id="0e55-5aa0-3caf-c1d1" name="Exosub Mine Clearance (3.04)" hidden="false" targetId="6d04-40f6-eafc-bf99" type="rule"/>
+        <infoLink id="dc92-b90d-f40e-55ca" name="Shadow Hunter (3.04)" hidden="false" targetId="741b-a6ce-dbe7-9409" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="13f1-afab-5aa6-1adc" name="Empire" hidden="false" targetId="ce97-a91c-c2c9-c566" primary="false"/>
@@ -6894,9 +6934,11 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
                 <modifier type="set" field="name" value="Rin Exosub"/>
               </modifiers>
             </infoLink>
+            <infoLink id="d2a5-073c-e285-c94f" name="Exosub Capacity (3.04)" hidden="false" targetId="bedf-0499-55fa-2197" type="rule"/>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -6905,14 +6947,11 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bc92-e5b6-029c-1a73" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3985-5654-2a18-c3ce" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="115.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="125.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="63cf-5d01-0278-9962" name="Koromodako" hidden="false" collective="false" import="true" type="model">
@@ -6922,40 +6961,38 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="154a-8514-e260-77e4" name="Koromodako" hidden="false" targetId="b0bb-b20f-5f0c-dd6f" type="profile"/>
-        <infoLink id="ca72-3f2a-677d-4f32" name="Agile" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="c008-bafa-65ed-034c" name="Elite Crew" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
-        <infoLink id="fa54-f874-a0f4-9c78" name="Shokushu" hidden="false" targetId="21eb-6e97-cfe9-30b0" type="rule"/>
-        <infoLink id="65a1-6286-b644-e640" name="Terror From Belove" hidden="false" targetId="405a-6e4d-45ad-b188" type="rule"/>
+        <infoLink id="ca72-3f2a-677d-4f32" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="c008-bafa-65ed-034c" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
+        <infoLink id="fa54-f874-a0f4-9c78" name="Shokushu (3.04)" hidden="false" targetId="21eb-6e97-cfe9-30b0" type="rule"/>
+        <infoLink id="65a1-6286-b644-e640" name="Terror From Belove (3.04)" hidden="false" targetId="405a-6e4d-45ad-b188" type="rule"/>
+        <infoLink id="a1b4-207d-655b-3bda" name="Shadow Hunter (3.04)" hidden="false" targetId="741b-a6ce-dbe7-9409" type="rule"/>
+        <infoLink id="71bf-65f9-5899-af1d" name="Silent Hunter (3.04)" hidden="false" targetId="4073-0c13-d827-7ab1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="69c3-3458-1de6-00c6" name="Empire" hidden="false" targetId="ce97-a91c-c2c9-c566" primary="true"/>
         <categoryLink id="a352-24cc-20f7-5be8" name="Submersible Attack Ship" hidden="false" targetId="93cc-d49b-5565-a569" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="ac80-87d0-6447-f7b2" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
+        <entryLink id="ac80-87d0-6447-f7b2" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="01d5-7993-949d-e287" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1c20-f4ba-272c-b063" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="105.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="133b-27b6-a2a9-b81e" name="Kansai" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9dca-cedb-6005-7fb5" type="min"/>
-        <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d950-2780-35cf-fc8a" type="max"/>
+        <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d950-2780-35cf-fc8a" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="dee0-532b-7b08-1194" name="Kansai" hidden="false" targetId="bbba-e90b-f6e7-7e5b" type="profile"/>
         <infoLink id="92f4-60c5-cc8a-97ca" name="Elite Crew" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
-        <infoLink id="b6df-26d5-0da8-81be" name="Shadow Hunter" hidden="false" targetId="741b-a6ce-dbe7-9409" type="rule"/>
-        <infoLink id="f828-cafd-ff3c-7577" name="Submarauder" hidden="false" targetId="481e-dcda-510f-f32d" type="rule"/>
+        <infoLink id="b6df-26d5-0da8-81be" name="Shadow Hunter (3.04)" hidden="false" targetId="741b-a6ce-dbe7-9409" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="b441-106a-ffd4-f39d" name="Empire" hidden="false" targetId="ce97-a91c-c2c9-c566" primary="true"/>
@@ -6973,7 +7010,8 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="100.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="75.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="2f3c-65cf-8815-2eee" name="Kaiju" hidden="false" collective="false" import="true" type="model">
@@ -6983,11 +7021,11 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="ef82-0c7e-ab0e-a1c9" name="Kaiju" hidden="false" targetId="1a90-7baf-901a-6e9e" type="profile"/>
-        <infoLink id="830d-6a96-ad3f-9a98" name="Mine Layer" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
-        <infoLink id="2a5f-5eca-d5a0-dd86" name="Mechanical Soul" hidden="false" targetId="a278-bd16-046d-acb6" type="rule"/>
-        <infoLink id="daff-7714-e6d8-00f3" name="Shokushu" hidden="false" targetId="21eb-6e97-cfe9-30b0" type="rule"/>
-        <infoLink id="53d7-eddc-cc88-db1a" name="Colossus" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
-        <infoLink id="7d82-f7da-49ba-3139" name="Submarauder" hidden="false" targetId="481e-dcda-510f-f32d" type="rule"/>
+        <infoLink id="830d-6a96-ad3f-9a98" name="Mine Layer (3.04)" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
+        <infoLink id="2a5f-5eca-d5a0-dd86" name="Mechanical Soul (3.04)" hidden="false" targetId="a278-bd16-046d-acb6" type="rule"/>
+        <infoLink id="daff-7714-e6d8-00f3" name="Shokushu (3.04)" hidden="false" targetId="21eb-6e97-cfe9-30b0" type="rule"/>
+        <infoLink id="53d7-eddc-cc88-db1a" name="Colossus (3.04)" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
+        <infoLink id="7d82-f7da-49ba-3139" name="Submarauder (3.04)" hidden="false" targetId="481e-dcda-510f-f32d" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="9206-e823-b114-7633" name="Empire" hidden="false" targetId="ce97-a91c-c2c9-c566" primary="true"/>
@@ -6999,23 +7037,16 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ff81-7b94-b5cc-312d" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="92b0-37b0-74d8-ef44" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="37d8-1fb0-e245-ea99" name="Scalpel Lancette" hidden="false" collective="false" import="true" targetId="4e2e-beb0-7b7d-0f80" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c48e-c13f-393e-2d21" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0d1a-3540-634a-a5c7" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="151.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="138.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="2fac-6703-3887-c673" name="Kagutsuchi" hidden="false" collective="false" import="true" type="model">
@@ -7025,7 +7056,8 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </constraints>
       <infoLinks>
         <infoLink id="7e30-e014-f096-9cf2" name="Kagutsuchi" hidden="false" targetId="6752-64a0-4773-cddc" type="profile"/>
-        <infoLink id="1717-d136-6105-bb21" name="Elite Crew" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
+        <infoLink id="1717-d136-6105-bb21" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
+        <infoLink id="e869-cb2c-e9ed-c3ba" name="Shadow Hunter (3.04)" hidden="false" targetId="741b-a6ce-dbe7-9409" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="71a5-102b-117e-3e33" name="Empire" hidden="false" targetId="ce97-a91c-c2c9-c566" primary="true"/>
@@ -7033,16 +7065,11 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </categoryLinks>
       <entryLinks>
         <entryLink id="235a-5886-00cd-0b8e" name="Magma Cast Generator" hidden="false" collective="false" import="true" targetId="b3c7-08d5-6e74-4bbf" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e11b-2be1-cfc9-4672" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="edde-2711-3692-001a" type="max"/>
-          </constraints>
           <entryLinks>
             <entryLink id="969e-9c9a-c1c1-aa07" name="Magma Sear" hidden="false" collective="false" import="true" targetId="c6bb-0f54-5a76-fd18" type="selectionEntry">
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7633-7e77-26dd-a0d5" type="min"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9945-2027-6dcd-2ea6" type="max"/>
-              </constraints>
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
             </entryLink>
           </entryLinks>
         </entryLink>
@@ -7050,14 +7077,11 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c84d-7a72-9e13-8530" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="47d2-95c2-aad5-069f" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="118.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="e077-32de-a400-3d74" name="Chubu" hidden="false" collective="false" import="true" type="model">
@@ -7066,9 +7090,9 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <constraint field="selections" scope="parent" value="6.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3764-18ff-6d64-cc3d" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="b0cf-342e-18fc-8c25" name="Agile" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="1ba3-a52b-848e-68aa" name="Elite Crew" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
-        <infoLink id="5276-e0b7-5c0e-66f0" name="Shadow Hunter" hidden="false" targetId="741b-a6ce-dbe7-9409" type="rule"/>
+        <infoLink id="b0cf-342e-18fc-8c25" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="1ba3-a52b-848e-68aa" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
+        <infoLink id="5276-e0b7-5c0e-66f0" name="Shadow Hunter (3.04)" hidden="false" targetId="741b-a6ce-dbe7-9409" type="rule"/>
         <infoLink id="0165-2b42-6bfb-da19" name="Chubu" hidden="false" targetId="4d26-8dd7-88c9-b503" type="profile"/>
       </infoLinks>
       <categoryLinks>
@@ -7080,14 +7104,11 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="484e-a0aa-4bdd-79eb" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f240-7901-937c-98d7" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="35.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9323-fb17-bc15-a9bf" name="Sakata" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -7146,6 +7167,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="44.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="210e-45b9-ab79-6d7d" name="Matsumoto" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -7277,6 +7299,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="299.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4057-0f70-0b53-9695" name="Barangao" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" type="model">
@@ -7367,6 +7390,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </selectionEntryGroups>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="57.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="b273-f6c7-55ac-fb10" name="Magwayen" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -7475,6 +7499,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </selectionEntryGroups>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="68.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4cb0-3f29-745d-7df1" name="Malandok" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -7722,6 +7747,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </selectionEntryGroups>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="160.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="cb6b-9d4d-1a58-5b57" name="Akita" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -7985,6 +8011,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="332.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="398a-48b0-b6c9-0995" name="Ergun" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -8238,6 +8265,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="285.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0a51-dff9-ab51-a44a" name="Heilong" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -8495,6 +8523,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="282.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0b81-182e-3b43-719a" name="Shinzua Nyoi" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="model">
@@ -8604,6 +8633,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="349.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="b655-f0cb-b9ea-6bbb" name="Oni" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="model">
@@ -8681,40 +8711,12 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="265.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
   </sharedSelectionEntries>
   <sharedRules>
-    <rule id="904b-b97c-9150-5ada" name="Decentralised Systems*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
-      <description>At the start of each Round this Unit may declare it has changed its heading. Nominate which of the sides of each Model in the Unit is the ‘Front’. You may either rotate the Model to this new facing or simply nominate a specific side of the Model. For the remainder of its Activation each Model acts with that new facing for Drift, Movement, Shooting etc.</description>
-    </rule>
-    <rule id="9816-51d2-6c9c-d6e3" name="Alchemical Conflagration*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
-      <description>Actions by this Model with the Alchemical or Hazardous Quality gain the Devastating Quality.</description>
-    </rule>
-    <rule id="1b1c-3753-9c1c-562b" name="Secondary Strike*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
-      <description>This Model may use this weapon in a Ramming Action as though it were mounted in the Fore Arc. Alternatively, each time a Model with this rule does not use one of the specified weapons this Activation, it may add +3 to any Ramming Attack the Model makes in that Activation.</description>
-    </rule>
-    <rule id="21eb-6e97-cfe9-30b0" name="Shokushu*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
-      <description>Models with this rule gain +3 to their Assault Dice Pool when making an Assault or Ram, or +5 if this Model and the Initial Target has the Colossus rule. Once per Activation, all Models in this Unit may make the following Valour Effect. A single enemy Model (of the same Mass or less as this Model) within 4” of a Model in this Unit may immediately be placed in base contact with this Model in any orientation of the Attacking Player’s choosing. This is not a Collision but is instead treated as a Ramming Action by this Model. This rule cannot be used against Aerial Units unless this Model is an Aerial Unit.</description>
-    </rule>
-    <rule id="4bc1-ae95-2417-c55e" name="Rin Exosub*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
-      <description>The Rin Exosub Battle-Ready Capacity / Crippled Capacity for each Model in this Unit is indicated in parenthesis. Each Model in this Unit may place the indicated number of Rin Exosub Tokens up to 40&quot; from this Model in base contact with an enemy Model. Rin Exosubs can make Attack Runs like SRS Tokens but have a choice of attack profile representing whether they attack from above or below the target. Declare when you are making the Attack Run what all of the Rin Exosub Tokens are doing. All Rin Exosubs must make the Attack Run in the same way. They may either Attack with 5 Action Dice per Token with the Homing, Devastating and Submerged Qualities or may Attack with 5 Action Dice per Token with the Homing, Piercing and Aerial Qualities. Rin Exosub Tokens cannot be intercepted but their Attacks may be Defended against as normal.</description>
-    </rule>
-    <rule id="6d04-40f6-eafc-bf99" name="Exosub Mine Clearance*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
-      <description>During its Operations Step, while placing its Rin Exosub Tokens, this Model may also place tokens in contact with a Minefield Marker within 20”. At the end of the Special Operations Step discard a Rin Exosub Token and roll an Action Die. On a Hit, Heavy Hit or Exploding Hit, the Minefield Marker is discarded. You may repeat this attempt as many times as there are Rin Exosub Tokens remaining in the stack. If the Minefield Marker is discarded, any remaining Rin Exosub Tokens in the stack may be placed on another Minefield Marker within 10”to continue a Mine Clearance attempt on that Marker. If there are not any Minefield Markers within 10”, the Rin Exosub Tokens remain in place until the End Phase when they may Scramble or Find New Targets.</description>
-    </rule>
-    <rule id="48ce-061e-b6a2-ee9b" name="Tidal Surge*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
-      <description>This is a Special Operations Action that may be made by any Model in the Unit with the Paddlewheel Trait unless it has a Navigation Lock Critical Damage Marker or is making another Action requiring the Paddlewheels Trait. The Model making a Tidal Surge Action moves its Drift value directly backwards and reduces its Speed Attribute to zero for the Activation. Models making a Tidal Surge gain +3ADV and SDV for the duration of the Round. Submerged Units and Surface Units cannot deploy within 5” of Model’s making a Tidal Surge Action in that Round. Furthermore, any Submerged Units within 5” of a Unit with one or more Models making a Tidal Surge Action immediately suffer a Level of Disorder. This Model may not Turn while making this Action.</description>
-    </rule>
-    <rule id="3be6-2431-4561-e912" name="Shield Generator Tower*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
-      <description>This Unit is equipped with a Shield Generator. It may not be upgraded or replaced. The tower enables the Unit’s Shield Generator to not be limited to a maximum of 3 dice and instead uses the Unit’s actual Mass value.</description>
-    </rule>
-    <rule id="7b58-8bd9-9f4f-1fc3" name="Harokku Generator Array*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
-      <description>This Model is equipped with a special type of array that gives its Generators additional power and range. Any Friendly Models within 7” of this Model, with a Mass of 2 or greater, counts as being equipped with the same Generators as this Model. The Array cannot give Models the benefit from duplicate Generators at any time.</description>
-    </rule>
-    <rule id="a9e3-8627-83dc-bc61" name="Lingchi Shadow Jumpers*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
-      <description>Models in this Unit may make a Special Operations Action known as Landing. If this Model comes into contact with terrain identified in the Encounter as a Landing Point, it does not suffer damage and may remain stationary, with a Drift of zero for the Round. During the Reserves Step of any Round where this Model is in contact with the Landing Zone, when a friendly Ground Unit becomes available from Reserve, it may be deployed within 2” of this Model rather than using any other deployment options. Once a Ground Unit has been deployed using this Model, then place this Model at least 2” from the Landing Zone in any direction desired. This Model loses the Landing Vessel rule for the remainder of the Encounter.</description>
-    </rule>
+    <rule id="eb02-7c30-761c-3f44" name="New Rule" hidden="false"/>
   </sharedRules>
   <sharedProfiles>
     <profile id="47ab-a0bd-011e-796a" name="Bushi Ryu Dojo" publicationId="7b2b-0f56-3962-5ec1" hidden="false" typeId="f5d9-cb1c-6514-45c8" typeName="Stats Generator">
@@ -9200,9 +9202,9 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
     </profile>
     <profile id="dbd9-8fb2-88e6-7a63" name="Ofukoro" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model    ">
       <characteristics>
-        <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">2/2</characteristic>
+        <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">3/3</characteristic>
         <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">3/1</characteristic>
-        <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">0/0</characteristic>
+        <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">3/1</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">6/6</characteristic>
         <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">12/11</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">2/1</characteristic>
@@ -9240,14 +9242,14 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
     <profile id="5499-f44e-7e2e-a6af" name="Tianlong" publicationId="7b2b-0f56-3962-5ec1" page="16" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model    ">
       <characteristics>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">2/2</characteristic>
-        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">7/7</characteristic>
-        <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">8/8</characteristic>
-        <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">5/5</characteristic>
-        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">9/9</characteristic>
+        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">9/7</characteristic>
+        <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">7/7</characteristic>
+        <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">6/5</characteristic>
+        <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">10/9</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/4</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">1/1</characteristic>
         <characteristic name="Fray" typeId="4c54-804a-8993-7325">5/3</characteristic>
-        <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">4/2</characteristic>
+        <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">4/3</characteristic>
       </characteristics>
     </profile>
     <profile id="832a-2786-9a33-049b" name="Qianshao" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model    ">
@@ -9260,7 +9262,7 @@ A single maximum sized Hotspur Support Carrier Unit may be upgraded for +20pts t
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/4</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">0/0</characteristic>
         <characteristic name="Fray" typeId="4c54-804a-8993-7325">8/7</characteristic>
-        <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">4/4</characteristic>
+        <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">3/5</characteristic>
       </characteristics>
     </profile>
     <profile id="da81-7592-9d3b-0602" name="Ziwei" publicationId="7b2b-0f56-3962-5ec1" page="17" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model    ">
diff --git a/Enlightened.cat b/Enlightened.cat
index 36e4030..6552fbd 100644
--- a/Enlightened.cat
+++ b/Enlightened.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="50c4-91af-d01e-a4e1" name="Enlightened v3.03" revision="14" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="8" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="50c4-91af-d01e-a4e1" name="Enlightened v3.03" revision="14" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <comment>Last Enlightened ORBAT 3.03 (published 07/02/2023)</comment>
   <readme>Review 1.02.00: initial edition according to Enlightened ORBAT 1.02a
 Review 1.02.01: bux fixing and correct Physeter Ambush management
@@ -899,6 +899,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="ea06-b3d2-cea2-25c8" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -926,6 +927,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -936,6 +938,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="b196-84ad-68ca-da61" name="DiogenesTorpedo Submarines Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -957,6 +960,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="69a1-c4e1-12b0-146e" name="The Oedipus" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -1016,6 +1020,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="5f77-75a7-d308-b195" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1043,6 +1048,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1053,6 +1059,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="93ae-25c6-7a98-a1b3" name="Praxilla Hunter Killer Submarine Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1074,6 +1081,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ec74-ad12-0575-eaae" name="Ulysses Vanguard Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1102,6 +1110,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="6fc5-b9e1-9f00-7267" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1118,6 +1127,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1128,6 +1138,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="b1d9-dd32-c528-24ad" name="Lovelace Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1156,6 +1167,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="5dd1-48a3-2d5b-57a3" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1172,6 +1184,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1182,6 +1195,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="2f9f-aa37-d1ca-885e" name="Stiletto Fast Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1205,6 +1219,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="151f-3277-20a3-2f8d" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1216,6 +1231,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1226,6 +1242,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="e9d7-6a16-1628-6b4d" name="Antarctica Superiority Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1254,6 +1271,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="b83a-5d26-cfac-77fe" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1270,6 +1288,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1280,6 +1299,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="7ad4-c8da-8f45-1b8f" name="Chatelet Recon Cruiser Squadron" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="unit">
@@ -1308,6 +1328,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="a6f0-165f-5776-e4c4" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1324,6 +1345,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1334,6 +1356,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="b201-4e14-6728-9d6c" name="Copernicus Heavy Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1362,6 +1385,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="41e4-ea25-2a22-c868" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1378,6 +1402,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1388,6 +1413,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="e746-7c95-7a64-c30c" name="Claudius Merchantman Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1416,6 +1442,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="a122-38bf-408f-e9f2" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1432,6 +1459,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1442,6 +1470,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="02ad-cf3c-ab55-645b" name="Plinius Support Carrier Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1465,6 +1494,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="8cae-e303-9fd9-a8a1" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1476,6 +1506,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1486,6 +1517,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="e2a8-bd01-4fce-107d" name="Hypatia Generator Ship" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -1547,6 +1579,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="10af-ce90-f600-8a7b" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1574,6 +1607,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1584,6 +1618,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="387d-44bf-a25e-2d40" name="The Prometheus" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -1644,6 +1679,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="9b9a-60d5-48f1-dfd4" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1671,6 +1707,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1681,6 +1718,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="8d92-860c-c4bf-441c" name="Merian Frigate Squadron" hidden="false" collective="false" import="false" type="unit">
@@ -1711,6 +1749,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="5f7a-dc82-6fc6-0d74" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1727,6 +1766,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1737,6 +1777,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c50e-ac68-df53-6b1e" name="Physeter Ambush" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="upgrade">
@@ -1768,6 +1809,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-12.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="275e-6dde-dd98-ba0a" name="Vesalius Physeter Surgical Ship Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1791,6 +1833,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="155a-f49e-b47b-83dd" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1802,6 +1845,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1812,6 +1856,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9cf5-dc29-bb4a-0c10" name="Tacitus Assault Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1835,6 +1880,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="271c-f482-91a9-5759" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1846,6 +1892,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1856,6 +1903,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="57f6-1f2a-def3-3a51" name="Quintilian Bombardment Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1879,6 +1927,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="ecf9-898c-a6ce-455a" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1890,6 +1939,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1900,6 +1950,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f513-df45-4243-e96d" name="Newton Void-Engine Cruiser Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -1923,6 +1974,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="1fab-936e-5c1d-651b" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1934,6 +1986,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1944,6 +1997,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d485-7bb1-fba2-28c6" name="Lotan Myriapoda Colossus Squadron" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="unit">
@@ -1974,6 +2028,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="95eb-28e5-310f-f8fd" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -1990,6 +2045,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2000,6 +2056,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="421f-de4a-9233-82c0" name="Ketos Myriapoda Colossus Squadron" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="unit">
@@ -2030,6 +2087,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="22f2-adef-b598-0aed" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -2046,6 +2104,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2056,6 +2115,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="4.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="73cc-6ff0-77e5-cff7" name="The Belgica" hidden="false" collective="false" import="true" type="unit">
@@ -2090,6 +2150,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="1274-feb9-8baa-130f" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -2101,6 +2162,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2111,6 +2173,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ee8e-e4b6-5c7e-fc32" name="The Schneider" hidden="false" collective="false" import="true" type="upgrade">
@@ -2170,6 +2233,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="31bf-498a-b213-8fbe" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -2197,6 +2261,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2207,6 +2272,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="aa94-f7b1-c3f8-051b" name="Archimedes Vault Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -2267,6 +2333,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="53eb-adf9-6747-ece8" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -2294,6 +2361,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2304,6 +2372,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="610d-6620-c024-22b5" name="Daedelus Grand Fabricator" hidden="false" collective="false" import="true" type="upgrade">
@@ -2363,6 +2432,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="e5b1-05c6-9a94-f264" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -2390,6 +2460,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2400,6 +2471,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4f1c-96de-8029-2cba" name="Nansen Explorer" hidden="false" collective="false" import="true" type="model">
@@ -2461,6 +2533,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="e4fe-7c19-25aa-0a0d" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -2488,6 +2561,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2498,6 +2572,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ed8e-8264-cf26-5eb6" name="Amo Carrier Frigate Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -2528,6 +2603,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="fa08-a5a1-7d3e-29f2" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -2544,6 +2620,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2554,6 +2631,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="cbfe-ebe8-2a8d-d56c" name="Origen Lathe Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -2567,6 +2645,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f987-41a1-03ce-5a3c" name="Valtar Aether Saucer Squadron" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="unit">
@@ -2592,6 +2671,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="fdbc-0a47-80c1-cb0f" name="Pytheus Recon Saucers Squadron" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="unit">
@@ -2617,6 +2697,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="696e-9cab-27df-fed3" name="Haunebu Battle Saucer Squadron" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="unit">
@@ -2642,6 +2723,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="7922-c7d1-49aa-f192" name="Euclid Scout Saucers Squadron" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="unit">
@@ -2667,6 +2749,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="7105-5a56-9988-95e9" name="Adamski Strike Saucer Squadron" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="unit">
@@ -2692,6 +2775,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="eddb-deb4-2259-7e06" name="Zumeena Capacitor Ship" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -2705,6 +2789,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0e75-0333-f223-79f5" name="Icarus Aeronautic Fabricator" hidden="false" collective="false" import="true" type="upgrade">
@@ -2765,6 +2850,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="6e92-2769-ae39-2855" name="Zumeena Capacitor Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -2792,6 +2878,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2802,6 +2889,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4a4c-6377-3749-b506" name="Thule Sky-Fortress" hidden="false" collective="false" import="true" type="model">
@@ -2828,6 +2916,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
   </selectionEntries>
@@ -2839,7 +2928,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="19f1-1478-f646-831d" name="Descartes" hidden="false" targetId="d6ec-4157-6788-a1cc" type="profile"/>
-        <infoLink id="5bc1-ebfc-da38-79b4" name="Heavy Firepower*" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="5bc1-ebfc-da38-79b4" name="Heavy Firepower (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
         <infoLink id="2977-7d30-f562-ba5b" name="Mine Sweeper*" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
         <infoLink id="f37a-e25e-40d2-bba9" name="Cetacean Escorts*" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="b548-5d0d-cdce-67af" type="rule"/>
         <infoLink id="3c19-7a7b-a854-4862" name="Luminiferous Defences*" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
@@ -2847,7 +2936,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
         <infoLink id="53c7-6ea6-e38b-0caa" name="Physeter Constructs*" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="6e2e-abc9-576c-fdac" type="rule"/>
         <infoLink id="6b79-d3fc-ea53-9084" name="Mine Layer*" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
         <infoLink id="da26-f80a-9c6f-787d" name="Cetacean Launch Tubes*" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="4533-b977-669c-bdcc" type="rule"/>
-        <infoLink id="696a-f07e-ad83-a323" name="Command Codes*" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="1c64-d581-925a-6659" type="rule"/>
+        <infoLink id="696a-f07e-ad83-a323" name="Command Codes (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="422e-0279-5ff5-c279" type="rule"/>
         <infoLink id="70c9-74d1-da32-2503" name="Enlightened Science*" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
         <infoLink id="a99f-33be-d3e7-6354" name="Physeter Assault*" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="16cf-2537-6b52-ba3a" type="rule"/>
         <infoLink id="32b3-c25e-95a4-1d3e" name="Vulnerable Stern*" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
@@ -2874,6 +2963,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="ad0d-523c-1e62-8a2e" name="Orca Construct Token" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="upgrade">
@@ -2885,6 +2975,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -3096,6 +3187,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="245.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="add5-5e28-d19a-c554" name="Amo" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -3129,6 +3221,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -3145,6 +3238,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="33.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9d20-c7a0-25c8-81a3" name="The Oedipus" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -3191,6 +3285,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -3240,6 +3335,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="260.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f19a-a92a-f034-2d7e" name="Diogenes" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -3280,6 +3376,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="35.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="131d-7d6c-7384-a157" name="Merian" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -3414,6 +3511,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="40.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="da7f-d98e-1c35-a83c" name="Germain Zebeks" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -3454,6 +3552,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="0917-52ad-a761-6a40" name="Micro Torpedo Salvo - (F)" hidden="false" collective="true" import="true" type="upgrade">
@@ -3476,6 +3575,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="b5bf-482a-de82-a43e" name="Particle Beamer - (F/P/S)" hidden="false" collective="true" import="true" type="upgrade">
@@ -3497,11 +3597,13 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="28.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="8e42-62ff-8b18-de82" name="Ulysses" publicationId="908d-6feb-2e9e-843b" page="" hidden="false" collective="false" import="true" type="model">
@@ -3540,6 +3642,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -3703,6 +3806,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="110.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4d8f-7db9-26b5-6c2d" name="Stiletto" publicationId="908d-6feb-2e9e-843b" page="" hidden="false" collective="false" import="true" type="model">
@@ -3825,6 +3929,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="85.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4f58-da9b-4576-559d" name="Lovelace" publicationId="e265-8c7f-a4b2-a48e" page="" hidden="false" collective="false" import="true" type="model">
@@ -4002,6 +4107,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="99.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c952-6055-eacc-e791" name="Antarctica" publicationId="e265-8c7f-a4b2-a48e" page="" hidden="false" collective="false" import="true" type="model">
@@ -4218,6 +4324,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="150.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3dc3-f66c-d86c-cb1a" name="Chatelet" publicationId="e265-8c7f-a4b2-a48e" page="" hidden="false" collective="false" import="true" type="model">
@@ -4253,6 +4360,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -4360,6 +4468,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="93.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4777-0fb8-2184-8ae7" name="Copernicus" publicationId="e265-8c7f-a4b2-a48e" page="" hidden="false" collective="false" import="true" type="model">
@@ -4524,6 +4633,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="135.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ab84-f893-c25e-98ef" name="Claudius" publicationId="e265-8c7f-a4b2-a48e" page="" hidden="false" collective="false" import="true" type="model">
@@ -4556,6 +4666,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="80.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -4654,6 +4765,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="65.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0c58-42d6-8eba-1acf" name="Plinius" publicationId="908d-6feb-2e9e-843b" page="" hidden="false" collective="false" import="true" type="model">
@@ -4693,6 +4805,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -4733,6 +4846,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="137.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="6681-9f74-c52c-c5e2" name="Hypatia" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" type="model">
@@ -5015,6 +5129,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="270.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f2c9-5906-6427-2790" name="The Prometheus" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -5143,6 +5258,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="260.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4131-f613-f072-b08f" name="Physeter Ambush" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" type="model">
@@ -5181,6 +5297,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </categoryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="12.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="01b0-d1e7-aeb1-ca27" name="Vesalius" publicationId="908d-6feb-2e9e-843b" page="" hidden="false" collective="false" import="true" type="model">
@@ -5221,6 +5338,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -5252,6 +5370,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="135.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0e00-1dad-4290-e9e8" name="Quintilian" publicationId="908d-6feb-2e9e-843b" page="" hidden="false" collective="false" import="true" type="model">
@@ -5383,6 +5502,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="138.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="775d-04e7-6976-7386" name="Tacitus" publicationId="e265-8c7f-a4b2-a48e" page="" hidden="false" collective="false" import="true" type="model">
@@ -5627,6 +5747,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="138.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="7bf8-686e-ae44-5343" name="Newton" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -5685,6 +5806,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="128.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="327b-d2a3-9ea1-5300" name="Ketos" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="upgrade">
@@ -5746,6 +5868,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="144.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="e1fc-8c49-da50-fe49" name="Lotan" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="upgrade">
@@ -5806,6 +5929,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="146.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="72e5-e8f4-cc51-e5d0" name="The Belgica" publicationId="e265-8c7f-a4b2-a48e" page="" hidden="false" collective="false" import="true" type="model">
@@ -5889,6 +6013,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="170.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="e018-6dcf-f44d-7bb7" name="The Schneider" hidden="false" collective="false" import="true" type="model">
@@ -5997,6 +6122,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="455.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="55c7-7774-2e69-4377" name="Archimedes" hidden="false" collective="false" import="true" type="model">
@@ -6325,6 +6451,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="388.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="5e41-2e5c-b8ce-7773" name="Daedelus" hidden="false" collective="false" import="true" type="model">
@@ -6481,6 +6608,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="255.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="225b-86fa-8047-7d6f" name="Nansen" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -6520,6 +6648,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -6806,6 +6935,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="335.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="5acc-3f31-7bef-6708" name="Praxilla" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -6845,6 +6975,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="38.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3e83-0322-5fd5-8cee" name="Origen" hidden="false" collective="false" import="true" type="model">
@@ -6896,6 +7027,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="62.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="a088-be46-bca4-1a2d" name="Valtar" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -7003,6 +7135,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="160.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4ba8-9e6e-46f4-5188" name="Pytheus" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -7038,6 +7171,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -7060,6 +7194,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="56.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3da2-2c59-7da2-d4c0" name="Haunebu" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -7185,6 +7320,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="170.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="132c-0010-aebe-e4fb" name="Euclid" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -7295,6 +7431,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="56.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="44d8-e8fe-9659-45d8" name="Turbo Encabulation Drives" hidden="false" collective="true" import="true" type="upgrade">
@@ -7303,6 +7440,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </infoLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="cb0f-4f06-aab0-0636" name="Adamski" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -7380,6 +7518,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="145.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="983d-cab1-7b0a-8d59" name="Zumeena" hidden="false" collective="false" import="true" type="model">
@@ -7445,6 +7584,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="60.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="30b9-b511-da5e-4b90" name="Q-Ship" hidden="false" collective="false" import="true" type="upgrade">
@@ -7457,6 +7597,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </infoLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="80.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="728a-bfd0-1bb0-627f" name="Icarus" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
@@ -7505,6 +7646,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -7659,6 +7801,7 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="265.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="89bd-8203-0507-6a77" name="Thule" hidden="false" collective="false" import="true" type="model">
@@ -7808,14 +7951,12 @@ Review 3.03.08: correction suggested in GitHub 3.03 (date 2023-02-07)</readme>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="385.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
   </sharedSelectionEntries>
   <sharedRules>
-
-    <rule id="1b71-a146-9018-17b4" name="Enlightened Generator Ship*" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>Friendly Models within 10” of this Unit with a Mass of 2 or greater, counts as being equipped with the same Generators as this Model. This Unit cannot have more than one of any Generator type. It cannot give any other Unit the benefit from any Generator type more than once at any time.</description>
-    </rule>
+    <rule id="9773-f21f-cca8-3e4a" name="New Rule" hidden="false"/>
   </sharedRules>
   <sharedProfiles>
     <profile id="e4c4-d558-6493-7a89" name="Archimedes" publicationId="908d-6feb-2e9e-843b" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model    ">
diff --git a/Generator.cat b/Generator.cat
index 07f3495..4104c0c 100644
--- a/Generator.cat
+++ b/Generator.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="f69c-988c-fae3-e664" name="Generator" revision="8" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="f69c-988c-fae3-e664" name="Generator" revision="9" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>Review 1.00.00: generator collection
 Review 3.04.00: all generator included and updated
 Review 3.04.01: all generator included and updated. added 3.03 Orbat change
@@ -7,8 +7,9 @@ Review 3.04.02: added after Uniion Orbat update to 3.03
 Review 3.04.03: updated for Sultanate Orbat 3.03
 Review 3.04.04: new data for mid April updated
 Review 3.04.05: new data for mid September updated
-Review 3.05.00: new rules for 3.04 Orbats (rev.2
-)</readme>
+Review 3.04.06: new rules for 3.04 Orbats (rev.2
+)
+Review 3.04.07: update for 3.04 Orbats Sept &apos;23 release</readme>
   <categoryEntries>
     <categoryEntry id="0c85-39c7-9145-efeb" name="1" hidden="true"/>
     <categoryEntry id="8901-cc02-f55e-2ee5" name="2" hidden="false"/>
@@ -258,11 +259,8 @@ Review 3.05.00: new rules for 3.04 Orbats (rev.2
       </costs>
     </selectionEntry>
     <selectionEntry id="51db-ebdc-f4dc-6fff" name="Magma Cast Generator" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="false" import="true" type="upgrade">
-      <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="01d1-315f-ad76-f8b6" type="max"/>
-      </constraints>
       <infoLinks>
-        <infoLink id="27ab-f58e-e9b1-22d0" name="Magma Cast Generator" page="" hidden="false" targetId="0820-8799-3688-c122" type="profile"/>
+        <infoLink id="27ab-f58e-e9b1-22d0" name="Magma Cast generator" page="" hidden="false" targetId="0820-8799-3688-c122" type="profile"/>
         <infoLink id="9eca-a1d2-a85e-9148" name="Magma Cast generator" hidden="false" targetId="19bc-60bc-f7ef-9877" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -291,7 +289,8 @@ Review 3.05.00: new rules for 3.04 Orbats (rev.2
     </selectionEntry>
     <selectionEntry id="163e-8002-bc82-d20f" name="Mirage generator" publicationId="d854-a2d6-3d52-44c4" page="" hidden="false" collective="true" import="true" type="upgrade">
       <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7596-0780-5406-05de" type="max"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7596-0780-5406-05de" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="171e-ccf5-d8ae-0990" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="3907-23d0-234a-241a" name="Mirage generator" page="" hidden="false" targetId="0c80-8c19-6348-9a6c" type="profile"/>
@@ -323,7 +322,8 @@ Review 3.05.00: new rules for 3.04 Orbats (rev.2
     </selectionEntry>
     <selectionEntry id="74b0-d10f-4a04-5321" name="Portal generator" publicationId="d854-a2d6-3d52-44c4" page="" hidden="false" collective="true" import="true" type="upgrade">
       <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9b2a-d8da-1f24-2615" type="max"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9b2a-d8da-1f24-2615" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="639b-ec28-97e7-a357" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="fc3e-a3e1-8d44-8467" name="Portal generator" page="" hidden="false" targetId="bbcb-e6ac-1e89-35d2" type="profile"/>
@@ -499,7 +499,8 @@ Review 3.05.00: new rules for 3.04 Orbats (rev.2
     </selectionEntry>
     <selectionEntry id="b3c7-08d5-6e74-4bbf" name="Magma Cast Generator" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" collective="true" import="true" type="upgrade">
       <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9c55-1e8c-1492-95fd" type="max"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9c55-1e8c-1492-95fd" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ea38-0427-1b4a-e0a6" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="65f5-7a36-af9f-2e48" name="Magma Cast Generator" page="" hidden="false" targetId="0820-8799-3688-c122" type="profile"/>
@@ -531,7 +532,8 @@ Review 3.05.00: new rules for 3.04 Orbats (rev.2
     </selectionEntry>
     <selectionEntry id="596e-bbf7-4be2-d494" name="Shield generator" publicationId="7f09-e243-2307-78d0" page="" hidden="false" collective="true" import="true" type="upgrade">
       <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="75f3-eebc-4a7a-e4df" type="max"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="75f3-eebc-4a7a-e4df" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6192-e897-51ff-1d57" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="2355-90ef-cb97-579b" name="Shield generator" hidden="false" targetId="2086-333f-c525-6c88" type="profile"/>
@@ -547,7 +549,8 @@ Review 3.05.00: new rules for 3.04 Orbats (rev.2
     </selectionEntry>
     <selectionEntry id="9bf9-4303-3807-8b33" name="Internal Entropic Generator" publicationId="908d-6feb-2e9e-843b" page="" hidden="false" collective="true" import="true" type="upgrade">
       <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1731-3e11-53b4-03f9" type="max"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1731-3e11-53b4-03f9" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a388-c054-b9eb-63a7" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="c3a9-3979-0e48-6536" name="Internal Entropic Generator" page="" hidden="false" targetId="085f-7931-ddc5-bfdd" type="profile"/>
@@ -563,7 +566,8 @@ Review 3.05.00: new rules for 3.04 Orbats (rev.2
     </selectionEntry>
     <selectionEntry id="63e4-54cd-2af6-ce6c" name="Arc generator" publicationId="e6a1-85d3-8979-7880" page="" hidden="false" collective="true" import="true" type="upgrade">
       <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c1fb-5db4-703e-47a2" type="max"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c1fb-5db4-703e-47a2" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d85a-43cd-bc84-95d8" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="b5f7-b2d6-304e-6b10" name="Arc Generator" page="" hidden="false" targetId="0261-b767-cd91-14ae" type="profile"/>
@@ -595,7 +599,8 @@ Review 3.05.00: new rules for 3.04 Orbats (rev.2
     </selectionEntry>
     <selectionEntry id="b93b-874d-dc0b-5e44" name="Shockwave generator" publicationId="e265-8c7f-a4b2-a48e" page="" hidden="false" collective="true" import="true" type="upgrade">
       <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5811-9993-3dc4-2847" type="max"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5811-9993-3dc4-2847" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f558-af6f-b30e-13ad" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="9bad-73ae-39a3-3e71" name="Shockwave generator" hidden="false" targetId="23d6-0ce1-939e-1fff" type="profile"/>
@@ -611,7 +616,8 @@ Review 3.05.00: new rules for 3.04 Orbats (rev.2
     </selectionEntry>
     <selectionEntry id="fcc9-c0ad-7380-b6a2" name="Guardian generator" publicationId="dbca-8d57-b848-457e" page="" hidden="false" collective="true" import="true" type="upgrade">
       <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="970f-7b7b-5690-875b" type="max"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="970f-7b7b-5690-875b" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b183-2607-58bd-fa7d" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="cce1-d7cc-908e-5daa" name="Guardian generator" publicationId="7f09-e243-2307-78d0" page="35" hidden="false" targetId="1877-35d1-b915-2b6b" type="profile">
@@ -659,11 +665,12 @@ Review 3.05.00: new rules for 3.04 Orbats (rev.2
     </selectionEntry>
     <selectionEntry id="aaa0-4dc5-d12f-fcf9" name="Magnetic generator" publicationId="7f09-e243-2307-78d0" page="" hidden="false" collective="true" import="true" type="upgrade">
       <constraints>
-        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="384f-d696-2b82-0d7b" type="max"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="384f-d696-2b82-0d7b" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4716-8662-ee08-e74c" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="bc4d-78cc-7931-5d2c" name="Magnetic generator" hidden="false" targetId="586f-fde9-3d38-02d0" type="profile"/>
-        <infoLink id="0ad5-f2da-a32e-ab52" name="Magnetic generator" hidden="false" targetId="b4ba-a474-4872-aa00" type="rule"/>
+        <infoLink id="0ad5-f2da-a32e-ab52" name="Magnetic generator�" hidden="false" targetId="b4ba-a474-4872-aa00" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="93cf-dc27-617a-4c56" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
@@ -673,6 +680,64 @@ Review 3.05.00: new rules for 3.04 Orbats (rev.2
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
+    <selectionEntry id="33c4-9a5e-db6d-b083" name="Trident generator" publicationId="dbca-8d57-b848-457e" page="" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="373e-4d96-9d2d-3c0d" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f365-f661-acb8-ec2c" type="max"/>
+      </constraints>
+      <infoLinks>
+        <infoLink id="0b98-130c-0bc8-a532" name="Trident generator" page="" hidden="false" targetId="9512-f063-fbc2-a039" type="profile"/>
+        <infoLink id="2d0f-c75d-85a3-79df" name="Trident generator" hidden="false" targetId="d2ef-9795-16c8-9014" type="rule"/>
+      </infoLinks>
+      <categoryLinks>
+        <categoryLink id="de22-4921-5f4d-e57c" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
+      </categoryLinks>
+      <costs>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+      </costs>
+    </selectionEntry>
+    <selectionEntry id="2c4c-0057-e9cb-3122" name="Ivaldi Shroud generator" publicationId="7f09-e243-2307-78d0" page="35" hidden="false" collective="false" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9794-719f-ecfc-87ca" type="max"/>
+      </constraints>
+      <infoLinks>
+        <infoLink id="f3e3-36a2-bf74-eeff" name="Shroud generator" hidden="false" targetId="1873-22df-b3ba-49db" type="profile">
+          <modifiers>
+            <modifier type="set" field="name" value="Ivaldi Shround Generetor"/>
+          </modifiers>
+        </infoLink>
+        <infoLink id="dfb3-c690-5da9-3293" name="Ivaldi Shroud generator�" hidden="false" targetId="0b05-45a3-00b2-82b2" type="rule"/>
+      </infoLinks>
+      <categoryLinks>
+        <categoryLink id="0f5b-8c3d-6e26-5286" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
+      </categoryLinks>
+      <costs>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+      </costs>
+    </selectionEntry>
+    <selectionEntry id="9a69-c020-577f-5b8d" name="Francisco Solex Projector" publicationId="129d-da97-caec-1ddd" page="" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="adea-bf9f-58f3-2386" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2de5-2ef7-840a-d917" type="max"/>
+      </constraints>
+      <infoLinks>
+        <infoLink id="a5e1-107d-7479-46ec" name="Solex generator" page="" hidden="false" targetId="3c61-6b1f-6945-49dd" type="profile">
+          <modifiers>
+            <modifier type="set" field="name" value="Francisco Solex Projector"/>
+          </modifiers>
+        </infoLink>
+        <infoLink id="cdc4-193c-2f11-faeb" name="Solex Generator�" hidden="false" targetId="99d4-4010-e285-3397" type="rule"/>
+      </infoLinks>
+      <categoryLinks>
+        <categoryLink id="5999-9bf4-9bb8-8bbd" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
+      </categoryLinks>
+      <costs>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+      </costs>
+    </selectionEntry>
   </sharedSelectionEntries>
   <sharedRules>
     <rule id="0bab-bd34-0b75-76b1" name="Arc generator�" publicationId="e6a1-85d3-8979-7880" hidden="false">
@@ -779,6 +844,9 @@ Cryogenic Blasts and Iceberg Obstacles cannot cause damage to Aerial Units.</des
     <rule id="d79a-6377-a25e-d47f" name="Point Shield generator�" publicationId="e6a1-85d3-8979-7880" page="" hidden="false">
       <description>This Unit is equipped with a Point Defence Shield Generator. It may not be upgraded or replaced. The Point Defence Shield Generator appears and operates exactly like a Shield Generator except that it can be used when this Model is Obscured.</description>
     </rule>
+    <rule id="0b05-45a3-00b2-82b2" name="Ivaldi Shroud generator�" publicationId="7f09-e243-2307-78d0" page="" hidden="false">
+      <description>A Model with this Generator is Obscured to Shooting Attacks. Furthermore, as a Special Operations Action, this Model may be removed from Play and replaced at a new point completely within 5” of its original position. After the Model is removed, it must then be placed in Open Water with the same facing as when they were removed. This Generator may not be removed or replaced unless specified.</description>
+    </rule>
   </sharedRules>
   <sharedProfiles>
     <profile id="0261-b767-cd91-14ae" name="Arc Generator" publicationId="e6a1-85d3-8979-7880" hidden="false" typeId="f5d9-cb1c-6514-45c8" typeName="Stats Generator">
diff --git a/Imperium.cat b/Imperium.cat
index c470ba2..391d30e 100644
--- a/Imperium.cat
+++ b/Imperium.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="5037-a8ca-0033-3edc" name="Imperium 3.03" revision="11" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="8" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="5037-a8ca-0033-3edc" name="Imperium 3.03" revision="11" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <comment>Last Imperium ORBAT 3.03 (published 09/02/2023)</comment>
   <readme>Datafile history:
 1.04.01: Initial publication ORBAT v1.04a
@@ -731,6 +731,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4308-442a-ac76-3330" name="Volsung Strike Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -784,6 +785,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -794,6 +796,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="564a-6141-ac14-6450" name="Toten Heavy Destroyers Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -821,6 +824,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9270-9a4d-27df-e311" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -853,6 +857,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="01a2-8094-758f-6ebd" name="Metzger Vitruvian Colossus Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -899,6 +904,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -909,6 +915,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4b78-900c-f5f4-f53b" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -940,6 +947,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="6469-ef50-7640-66f6" name="Odin Reaver Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -990,6 +998,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="21f9-a25f-e10f-6ab3" name="Valkyrie Hunt Rotor Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1010,6 +1019,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1020,6 +1030,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d782-2451-0993-54c0" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1060,6 +1071,7 @@
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -1073,6 +1085,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="76fd-1193-780a-65b5" name="Hochmeister Vitruvian Colossus Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1098,6 +1111,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c6d3-590b-8862-6483" name="Blucher Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1132,6 +1146,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d1f4-d1c0-4e4b-9660" name="Elector Battleship" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -1226,6 +1241,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="b6f0-f888-3717-e1ec" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1245,6 +1261,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="f76b-62a6-d92e-6f2a" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1264,6 +1281,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="90f3-8785-bfef-eb66" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1282,6 +1300,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="cc3a-0a4b-5ecd-2637" name="Sigimer Destroyers Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1299,6 +1318,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1309,6 +1329,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="582a-7034-ce68-702c" name="Augustus Bombardment Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1338,6 +1359,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="bbff-5da9-e06c-9171" name="SMS Brandenburg" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -1404,6 +1426,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="7b28-a63e-df4e-dfb5" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1438,6 +1461,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="a113-0876-4fc1-8a90" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1479,6 +1503,7 @@
                   </infoLinks>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
+                    <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -1492,6 +1517,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="2209-3c19-4018-40be" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1525,6 +1551,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1580,6 +1607,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ab24-65ee-a749-0c7b" name="SMS Tirpitz" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -1646,6 +1674,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="43fd-78da-c7ab-eba2" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1680,6 +1709,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="1ee4-4957-fc44-2c47" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1721,6 +1751,7 @@
                   </infoLinks>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
+                    <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -1734,6 +1765,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="8629-9ef4-98dc-30df" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -1767,6 +1799,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1822,6 +1855,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="95aa-84d5-72b3-d79c" name="Ragnarok Heavy Reaver" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -1909,6 +1943,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -1919,6 +1954,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="92ee-a0f5-22aa-0535" name="Kaiser Heavy Battleship" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -2014,6 +2050,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="3658-a8de-25a9-4197" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2033,6 +2070,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="e4c4-ec21-eb8c-b649" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2052,6 +2090,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="2707-e6ff-acc6-037b" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2070,6 +2109,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="9ff7-28e5-6b87-3409" name="Sigimer Destroyers Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2087,6 +2127,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2097,6 +2138,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="debd-4ad7-9480-26fc" name="Tempelhof Fleet Carrier" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -2202,6 +2244,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="9008-4aa7-f7d1-b679" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2236,6 +2279,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="598f-0bed-aa1a-df06" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2277,6 +2321,7 @@
                   </infoLinks>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
+                    <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -2290,6 +2335,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="1a67-f4da-84de-c5f3" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2323,6 +2369,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2333,6 +2380,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d4f6-6195-6ee5-a19a" name="Tempelhof-Blitzen Fleet Carrier" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -2438,6 +2486,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="8394-1061-8c16-5e8f" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2472,6 +2521,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="a527-8182-70e8-b24e" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2513,6 +2563,7 @@
                   </infoLinks>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
+                    <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -2526,6 +2577,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="09a3-d65a-0197-ba89" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2559,6 +2611,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2569,6 +2622,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9f3e-f8e9-a0e5-f3fb" name="Ice Maiden Dreadnought Super-Carrier" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -2670,22 +2724,6 @@
                 <categoryLink id="4551-5c94-f5b1-bf37" name="Ferdinand Class" hidden="false" targetId="58f8-39a1-6a66-8f18" primary="false"/>
                 <categoryLink id="bdfa-2b1d-da83-8e11" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
               </categoryLinks>
-              <selectionEntries>
-                <selectionEntry id="d2f5-b9a2-8a9b-611e" name="Escort duty [Teutonic]" hidden="false" collective="false" import="true" type="upgrade">
-                  <modifiers>
-                    <modifier type="add" field="category" value="9ab6-c624-d0ae-dd32"/>
-                  </modifiers>
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="40da-58af-3459-9678" type="max"/>
-                  </constraints>
-                  <infoLinks>
-                    <infoLink id="982a-8366-e80c-c331" name="Escort Duty (Teutonic)" hidden="false" targetId="6d1c-671d-35a0-75e0" type="rule"/>
-                  </infoLinks>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
-                  </costs>
-                </selectionEntry>
-              </selectionEntries>
               <entryLinks>
                 <entryLink id="9148-b8f4-e99d-63fe" name="Ferdinand" hidden="false" collective="false" import="true" targetId="ddcc-bb51-2b54-8277" type="selectionEntry">
                   <modifiers>
@@ -2695,6 +2733,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2730,6 +2769,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="f1a0-f10c-7d52-bc2d" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2749,6 +2789,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="15d4-97d7-3fd0-6ea4" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2768,6 +2809,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="4f05-309b-e9e8-a752" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2786,6 +2828,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="65eb-06fe-3358-32b2" name="Sigimer Destroyers Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -2803,6 +2846,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2813,6 +2857,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="4506-458e-7db6-238b" name="SMS Eiskalte Schoenheit" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -2914,27 +2959,12 @@
                 <categoryLink id="c6ef-c0cd-5eac-4113" name="Ferdinand Class" hidden="false" targetId="58f8-39a1-6a66-8f18" primary="false"/>
                 <categoryLink id="320b-a327-9a40-c882" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
               </categoryLinks>
-              <selectionEntries>
-                <selectionEntry id="81d2-df52-c778-2bc5" name="Escort duty [Teutonic]" hidden="false" collective="false" import="true" type="upgrade">
-                  <modifiers>
-                    <modifier type="add" field="category" value="9ab6-c624-d0ae-dd32"/>
-                  </modifiers>
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f60b-a9ec-933a-60a9" type="max"/>
-                  </constraints>
-                  <infoLinks>
-                    <infoLink id="1c7b-2c6d-c2f1-a702" name="Escort Duty (Teutonic)" hidden="false" targetId="6d1c-671d-35a0-75e0" type="rule"/>
-                  </infoLinks>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
-                  </costs>
-                </selectionEntry>
-              </selectionEntries>
               <entryLinks>
                 <entryLink id="ebb2-e254-e40e-db3c" name="Ferdinand" hidden="false" collective="false" import="true" targetId="ddcc-bb51-2b54-8277" type="selectionEntry"/>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -2945,6 +2975,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="5704-1235-4399-5ff2" name="SMS Prinzessin Wilhelmina" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -3056,6 +3087,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="9ce4-85bd-0c19-8e24" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3090,6 +3122,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="a168-f5be-7176-1105" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3131,6 +3164,7 @@
                   </infoLinks>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
+                    <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -3144,6 +3178,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="24a4-3ee1-d8c3-420f" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3177,6 +3212,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -3187,6 +3223,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9904-7012-4e08-1f45" name="Heidelberg Logistics Battlecruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -3262,6 +3299,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="18e9-7ba1-d10c-468b" name="Holtzendorff Pattern Logistics Battlecruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -3338,6 +3376,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="aeff-71ec-9d5a-e878" name="Arminius Frigates Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3366,6 +3405,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="61a2-fdf7-f470-b152" name="Hoth Heavy Corvettes Squadron" hidden="false" collective="false" import="true" type="upgrade">
@@ -3401,6 +3441,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="5e2b-b29e-fd1e-5529" name="Ferdinand Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3430,6 +3471,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="eda7-ccaa-5eca-c930" name="Konig Generator Ship" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -3532,27 +3574,12 @@
                 <categoryLink id="1f98-29d5-4d57-5134" name="Ferdinand Class" hidden="false" targetId="58f8-39a1-6a66-8f18" primary="false"/>
                 <categoryLink id="53f9-9734-36a5-059d" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
               </categoryLinks>
-              <selectionEntries>
-                <selectionEntry id="e403-dae3-8870-f664" name="Escort duty [Teutonic]" hidden="false" collective="false" import="true" type="upgrade">
-                  <modifiers>
-                    <modifier type="add" field="category" value="9ab6-c624-d0ae-dd32"/>
-                  </modifiers>
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3692-7533-bda7-e6ac" type="max"/>
-                  </constraints>
-                  <infoLinks>
-                    <infoLink id="ac57-4248-d87d-9094" name="Escort Duty (Teutonic)" hidden="false" targetId="6d1c-671d-35a0-75e0" type="rule"/>
-                  </infoLinks>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
-                  </costs>
-                </selectionEntry>
-              </selectionEntries>
               <entryLinks>
                 <entryLink id="ed87-7e84-0789-e251" name="Ferdinand" hidden="false" collective="false" import="true" targetId="ddcc-bb51-2b54-8277" type="selectionEntry"/>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -3563,6 +3590,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3772-a744-7b46-c8e9" name="Lightning Raid" hidden="false" collective="false" import="true" type="upgrade">
@@ -3592,6 +3620,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-15.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3a1b-5d65-caa8-3a5a" name="Valkyrie Hunt Rotor Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3622,6 +3651,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3d6c-decf-19bf-9237" name="Nuremberg Heavy Airships Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3652,6 +3682,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0615-d5ac-3cd7-c424" name="Munich Aerial Destroyers Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3682,6 +3713,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ccfb-248b-0269-db7e" name="Kriegsturm Assault Airship Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3710,6 +3742,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ddb4-67d7-e2a8-2db1" name="Jaeger Aerial Fast Destroyers Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3738,6 +3771,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="68e9-ef36-73ff-c905" name="Fenrir Hunter Submarines Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3767,6 +3801,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="c144-b2e4-2b10-d3cf" name="Zrin Battle Platform" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3845,6 +3880,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3e96-cc21-5c06-9746" name="Varazdin War Platform" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3923,6 +3959,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="1ab3-3803-c09a-e7e4" name="Malus Anti-Air Destroyers Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3950,6 +3987,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="35c3-29b1-ca92-9a0c" name="Loki Shadow Raider Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -3999,6 +4037,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4009,6 +4048,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="119e-e494-ccee-0f1e" name="Gungnir Raider Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4058,6 +4098,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4068,6 +4109,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="a1c0-1b40-ed45-b6b1" name="Eltz Offshore Support Platform" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4146,6 +4188,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f0bd-b898-9022-4afc" name="Zeppelin Aerial Dreadnought" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="upgrade">
@@ -4229,6 +4272,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="f684-8261-cb4d-7408" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4263,6 +4307,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="b27b-525e-f355-857e" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4304,6 +4349,7 @@
                   </infoLinks>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
+                    <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -4317,6 +4363,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="b53a-1e02-325a-d65a" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4350,6 +4397,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4360,6 +4408,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="582f-5099-b133-4c03" name="Valhalla Fast Dreadnought" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="upgrade">
@@ -4427,6 +4476,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4456,6 +4506,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="700d-47a9-8804-4066" name="Stark Imperium Sky-Fortress" hidden="false" collective="false" import="true" type="model">
@@ -4540,6 +4591,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="b95a-5832-3ef2-aca6" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4574,6 +4626,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="3cc2-607b-0ae9-69eb" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4615,6 +4668,7 @@
                   </infoLinks>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
+                    <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -4628,6 +4682,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="df2c-453b-94a1-fcdb" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4661,6 +4716,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4671,6 +4727,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="6fd9-133e-ef87-3241" name="SMS Prinz Eugen" hidden="false" collective="false" import="true" type="model">
@@ -4757,6 +4814,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="b98a-f8b6-1ebd-7bfb" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4791,6 +4849,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="c68b-65eb-2d04-fc73" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4832,6 +4891,7 @@
                   </infoLinks>
                   <costs>
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
+                    <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
                   </costs>
                 </selectionEntry>
               </selectionEntries>
@@ -4845,6 +4905,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="d071-d5ec-db71-9d03" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4878,6 +4939,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4888,6 +4950,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f7d1-9d36-56e9-3dc7" name="Jotunn Heavy Raider Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4937,6 +5000,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -4947,6 +5011,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="554d-41cf-75d7-c722" name="Nuremberg Heavy Airships Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -4999,6 +5064,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="f6d1-67ff-f832-1494" name="Hochmeister Vitruvian Colossus Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -5030,6 +5096,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="42fd-b7ca-e2c2-419b" name="Heidelberg Logistics Battlecruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -5125,6 +5192,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="f2e6-e785-5ab0-8ac7" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -5144,6 +5212,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="4246-4b00-c7f9-8070" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -5163,6 +5232,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="0148-a156-6825-bef3" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -5181,6 +5251,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="3c79-760d-0c93-d3a6" name="Sigimer Destroyers Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -5198,6 +5269,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -5213,6 +5285,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="6769-1dd7-2b06-9764" name="Holtzendorff Pattern Logistics Battlecruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -5308,6 +5381,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="381c-9c4d-9648-932f" name="Reiter Flak Cruiser Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -5327,6 +5401,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="3b67-8d60-a2b6-93c6" name="Konrad Support Carrier Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -5346,6 +5421,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="d006-01d5-119e-0f45" name="Schaumburg Escort Cruiser" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -5364,6 +5440,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
             <selectionEntry id="56d4-1d2b-48da-082e" name="Sigimer Destroyers Squadron" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -5381,6 +5458,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -5396,6 +5474,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="8a4a-3432-e8c4-e7f1" name="Nachtsturm Flak Frigates" hidden="false" collective="false" import="true" type="upgrade">
@@ -5425,6 +5504,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ba34-244b-3060-9259" name="SMS Danegeld" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -5494,6 +5574,7 @@
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -5504,6 +5585,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3b46-1123-c184-054e" name="Zeppelin Aerial Dreadnought" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="upgrade">
@@ -5554,6 +5636,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="5997-619a-23a9-82a8" name="SMS Terra Mariana" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -5656,27 +5739,12 @@
                 <categoryLink id="f895-6865-98ff-d110" name="Ferdinand Class" hidden="false" targetId="58f8-39a1-6a66-8f18" primary="false"/>
                 <categoryLink id="95e5-447a-b74c-af64" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
               </categoryLinks>
-              <selectionEntries>
-                <selectionEntry id="406f-7e97-2581-8fd2" name="Escort duty [Teutonic]" hidden="false" collective="false" import="true" type="upgrade">
-                  <modifiers>
-                    <modifier type="add" field="category" value="9ab6-c624-d0ae-dd32"/>
-                  </modifiers>
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="833c-c09a-406d-ae0f" type="max"/>
-                  </constraints>
-                  <infoLinks>
-                    <infoLink id="2712-c631-4af9-5581" name="Escort Duty (Teutonic)" hidden="false" targetId="6d1c-671d-35a0-75e0" type="rule"/>
-                  </infoLinks>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
-                  </costs>
-                </selectionEntry>
-              </selectionEntries>
               <entryLinks>
                 <entryLink id="b7a5-86f6-e47c-bee0" name="Ferdinand" hidden="false" collective="false" import="true" targetId="ddcc-bb51-2b54-8277" type="selectionEntry"/>
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -5691,6 +5759,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
   </selectionEntries>
@@ -5752,6 +5821,7 @@
               </infoLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -5806,6 +5876,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="120.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="88d0-c92f-6c86-c0ec" name="Sigimer" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -5902,6 +5973,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="36.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="292b-959c-3aa1-e35b" name="Valkyrie" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -6001,6 +6073,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="46.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ae17-92f1-3924-e01b" name="Toten" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -6065,6 +6138,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="44.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ae3d-3977-1613-551c" name="Schaumburg" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -6107,6 +6181,7 @@
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="57.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9d7a-84f1-768c-7cdf" name="Odin" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -6229,6 +6304,7 @@ Options:
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="90.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="edbe-602c-946a-e281" name="Augustus" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -6321,6 +6397,7 @@ Options:
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="121.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="aa8a-205d-0c8f-6d0c" name="Metzger" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -6385,6 +6462,7 @@ A single Metzger Unit may be included in Battlefleets with a PRUSSIAN Flagship.
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="158.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="5bf0-f49d-a5c9-e661" name="Reiter" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -6434,6 +6512,7 @@ A single Metzger Unit may be included in Battlefleets with a PRUSSIAN Flagship.
               </infoLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -6488,6 +6567,7 @@ A single Metzger Unit may be included in Battlefleets with a PRUSSIAN Flagship.
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="129.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="35a7-f835-3107-ef28" name="Hochmeister" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -6640,6 +6720,7 @@ A single Metzger Unit may be included in Battlefleets with a PRUSSIAN Flagship.
       </selectionEntryGroups>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="175.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0a00-20b6-8589-4bde" name="Blucher" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -6798,6 +6879,7 @@ A single Metzger Unit may be included in Battlefleets with a PRUSSIAN Flagship.
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="100.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="60c6-0912-ed8b-3124" name="Konrad" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -6843,6 +6925,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -6911,6 +6994,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="135.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="35b1-e708-e60e-53f1" name="Arminius" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -6972,6 +7056,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="29.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="85a3-96ed-b75a-3bc3" name="Elector" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -7004,6 +7089,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -7217,6 +7303,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="239.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d41c-89f1-68c9-e3b6" name="SMS Brandenburg" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -7334,6 +7421,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="250.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0f44-7642-deee-01d1" name="SMS Tirpitz" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -7420,6 +7508,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="323.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="126d-fc85-3321-c65b" name="Ragnarok" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -7581,6 +7670,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="235.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0f14-7766-5825-69c1" name="Kaiser" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -7817,6 +7907,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="299.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9c00-2130-55a8-318a" name="Tempelhof" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -7851,6 +7942,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="8273-7439-02cd-8e60" name="Freya Array" hidden="false" collective="false" import="true" type="upgrade">
@@ -7868,6 +7960,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </rules>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -7920,6 +8013,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="255.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="49a2-b4a7-8431-09f6" name="Tempelhof-Blitzen" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -7959,6 +8053,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="b364-82ac-8947-add3" name="Freya Array" hidden="false" collective="false" import="true" type="upgrade">
@@ -7976,6 +8071,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </rules>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -8028,6 +8124,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="255.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0718-dd9f-543a-44d4" name="Ice Maiden" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -8069,6 +8166,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="c5f4-f3ad-5e7f-cf6a" name="Blitzen Bombers" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" type="upgrade">
@@ -8087,6 +8185,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -8239,6 +8338,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="535.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="893e-59a5-3811-1db1" name="SMS Eiskalte Schoenheit" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -8285,6 +8385,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="60ab-1d30-6b14-ad3d" name="SRS" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="true" import="true" type="upgrade">
@@ -8301,6 +8402,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -8462,6 +8564,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="555.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="0e93-c9f9-ad3b-59ac" name="SMS Prinzessin Wilhelmina" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -8505,6 +8608,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="c025-4205-53d9-df1c" name="Blitzen Bombers" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" type="upgrade">
@@ -8523,6 +8627,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -8644,6 +8749,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="570.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="3b9d-cdac-1144-692a" name="Heidelberg" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -8803,6 +8909,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="205.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="eb3e-3ff1-aa33-c37a" name="Holtzendorff" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -8864,6 +8971,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="205.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="56ba-3bd5-11f4-8078" name="Hoth" hidden="false" collective="false" import="true" type="model">
@@ -8913,6 +9021,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="32.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="ddcc-bb51-2b54-8277" name="Ferdinand" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -9067,6 +9176,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
               </infoLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -9112,6 +9222,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="116.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="9729-fb41-0716-7989" name="Konig" hidden="false" collective="false" import="true" type="upgrade">
@@ -9167,6 +9278,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
               </entryLinks>
               <costs>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="13.0"/>
+                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
               </costs>
             </selectionEntry>
           </selectionEntries>
@@ -9303,6 +9415,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="257.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="8e1e-8caa-9311-2571" name="Lightning Raid" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -9336,11 +9449,13 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="15.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d63a-de35-b7d5-3674" name="Nuremberg" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -9413,6 +9528,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="125.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="06e3-86ce-2042-d536" name="Munich" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="unit">
@@ -9464,6 +9580,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="42.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="fdf2-43e0-82cc-64a9" name="Kriegsturm" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -9544,6 +9661,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="125.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d3c8-7fc5-5ae3-279d" name="Jaeger" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -9602,6 +9720,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="41.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="5e71-b5a4-c325-048f" name="Fenrir" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -9639,6 +9758,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="30.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="7dab-8a6f-8eb3-f8df" name="Zrin" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -9732,6 +9852,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </selectionEntryGroups>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="60.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="1b8c-2476-7123-3eb6" name="Varazdin" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -10007,6 +10128,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </selectionEntryGroups>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="170.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="1b15-319a-2d4a-3d57" name="Malus" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -10079,6 +10201,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="45.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="2dd8-ea7c-d146-e72a" name="Loki" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -10155,6 +10278,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="113.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="62bf-21a6-9232-a4f8" name="Jotunn" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -10299,6 +10423,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="113.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="e286-ac68-7436-5f80" name="Gungnir" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -10368,6 +10493,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="73.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="d586-15db-01fe-fb65" name="Eltz" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -10486,6 +10612,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </selectionEntryGroups>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="68.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="43ba-6ded-6df6-f372" name="Stark" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -10528,6 +10655,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -10617,6 +10745,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="325.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="2a1c-0cc9-eefd-f0aa" name="SMS Prinz Eugen" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -10674,6 +10803,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="dbf3-5aa9-f400-27cd" name="Richtofen’s Flying Circus" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="upgrade">
@@ -10685,6 +10815,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="15.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -10752,6 +10883,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="360.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="56da-66ce-4439-7a8d" name="Valhalla" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -10795,6 +10927,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
         <selectionEntry id="6221-c7f7-0336-7e68" name="Freya Array" hidden="false" collective="false" import="true" type="upgrade">
@@ -10809,6 +10942,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </rules>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -10990,6 +11124,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="348.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="85c4-c694-24f4-b485" name="Zeppelin" publicationId="33cf-b4a6-bff0-0d70" hidden="false" collective="false" import="true" type="model">
@@ -11039,6 +11174,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </infoLinks>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+            <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
       </selectionEntries>
@@ -11131,6 +11267,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="300.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="16f1-6e6f-fa08-fb56" name="Pflicht Escort" publicationId="7f09-e243-2307-78d0" hidden="false" collective="false" import="true" type="unit">
@@ -11143,6 +11280,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </categoryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="356b-d41e-e275-1077" name="Nachtsturm" hidden="false" collective="false" import="true" type="upgrade">
@@ -11190,6 +11328,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="31.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="75fe-79e1-8560-267c" name="SMS Terra Mariana" hidden="false" collective="false" import="true" type="upgrade">
@@ -11293,6 +11432,7 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="262.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="b1b1-8c3f-30a5-e2ac" name="SMS Danegeld" publicationId="33cf-b4a6-bff0-0d70" page="" hidden="false" collective="false" import="true" type="model">
@@ -11368,65 +11508,12 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="260.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
   </sharedSelectionEntries>
   <sharedRules>
-    <rule id="bc6e-eb14-8b23-dd1c" name="Aces of Rensburg*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>Any Attack Run including one or more Aces of Rensburg SRS Tokens has the Voltaic and Piercing Qualities, provided that the Aces of Rensburg SRS Tokens are the majority of friendly SRS Tokens in the Attack Run.</description>
-    </rule>
-    <rule id="01df-88c6-831a-a096" name="Blitzen Bombers*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>The Blitzen Bombers Battle-Ready Capacity / Crippled Capacity for each Model in this Unit is indicated in parenthesis. Blitzen Bombers are SRS Tokens but contribute 5 Action Dice to Attack Runs. They can be combined with other friendly SRS Tokens in Attack Runs. A Blitzen Bomber SRS Token is removed for every two successes in Interception, but they can only be Intercepted once all other Friendly SRS Tokens have been Intercepted. Any Attack Run that has the majority of the Tokens as Blitzen Bombers has the Sustained, Bomb and Voltaic Qualities. If the number of Blitzen Bomber SRS Tokens in the Attack Run is greater than the Mass of the Attack Run Target, the Action Dice Pool gains the Devastating Quality. Blitzen Bombers cannot make an SRS Recon Flight or SRS Mine Clearance but may use the Combat Air Patrol rule. Blitzen Bombers cannot make Attack Runs on Aerial Units and must try to find New Targets in this situation.</description>
-    </rule>
-    <rule id="bfd9-edb1-6b05-a63f" name="Die Zeitwahl (NO)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>From the second round onwards, instead of rolling the Action Die when using the Unexpected Arrival Rule, this Unit may be immediately made available for deployment. While Battle Ready, as a special operations action this Unit may always be placed back into Reserves.</description>
-    </rule>
-    <rule id="d9c2-da22-5b37-8e61" name="Donnersturm*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>Once per Activation, this Unit may make the following Valour Effect. Any Claw Arc Projectors may be used in the Shooting Phase in the Fore Arc to make an Attack against an Initial Target within 20” using the Lightning Strike weapon profile. The Attack ignores Shield Generators, Storm Generators, Guardian Generators and Shroud Generators. The opponent may always attempt to Cancel this Valour Effect and does not require an additional rule to be able to do so.</description>
-    </rule>
-    <rule id="dbc4-f990-ae10-9e3c" name="Fechtbuch*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>Once per Activation, this Unit may make the following Valour Effect. Models with this rule gain +4 to their Assault Dice Pool when making an Assault, or +6 if the Initial Target has the Colossus rule.</description>
-    </rule>
-    <rule id="ed63-d88a-ee61-eadb" name="Freya Array*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>Enemy Units cannot be deployed within 5” of this Model. Furthermore, while a Unit contains one or more Models with a Freya Array, it may maintain coherency at 5” rather than the usual 4”.</description>
-    </rule>
-    <rule id="23c8-2871-2074-f6e8" name="Luftlancer Assault*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>This Model may make assaults within 6” rather than the usual 4”. Furthermore, the Assault by this Model gains the Voltaic Quality. This rule does not apply to Supporting Assaults</description>
-    </rule>
-    <rule id="16ae-277a-f9fd-0ff5" name="Modular Configuration*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>This Unit may switch the positions of its Bombard and Heavy Volt Gun Batteries for the duration of the Encounter. The Bombard has the Aft Fire Arc, while the Heavy Volt Gun Batteries have F/P/S Fire Arcs.</description>
-    </rule>
-    <rule id="315b-f13f-b624-a5b3" name="Monster of Nassau*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>This Unit awards +1 Victory Point to your opponent if it destroyed by a Unit with the Union Trait. As a Valour Effect, this Unit may fire both Bombards in the Fore or Aft Fire Arcs. The weapons may not be used more than once per Activation.</description>
-    </rule>
-    <rule id="3de2-727b-d075-6149" name="Pflicht Escort*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>The Pflicht is a special type of Escort Token (see pg 32 of the Dystopian Wars rules). Catastrophic Explosions can only remove a Pflicht Aerial Escort Token if caused by Attacks with the Aerial Quality.</description>
-    </rule>
-    <rule id="a08b-ca76-4317-3b52" name="Revel in Chaos (NO)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>Crippled Models with this rule still use the Battle Ready value of their weapons and any Assaults made gain the Devastating Quality.</description>
-    </rule>
-    <rule id="578b-41bb-5190-4d7e" name="Richtofen’s Flying Circus*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>Unit may be joined by Freiherr Albrecht von Richtofen’s elite Luftlancer division known as the Flying Circus. The Unit’s Fray is increased by +2 and Assaults led by this Unit have the Devastating and Voltaic Qualities. This Unit cannot Support Assaults.</description>
-    </rule>
-    <rule id="5137-138f-a6a4-b5c7" name="Vail Midget Subs*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>The Battle-Ready Capacity / Crippled Capacity of each Model in this Unit is indicated in parenthesis. Each Model in this Unit may place the indicated number of Vali Midget Sub Tokens up to 20&quot; from this Model in base contact with an enemy Model. Vali Midget Subs can make Attack Runs like SRS Tokens, but with 5 Action Dice. The Attack Run has the Homing, Piercing and Submerged Qualities. Vali Midget Sub cannot be intercepted. They cannot make Attack Runs on Aerial Units and must try to find New Targets if this situation arises (page 26 of the Rules).</description>
-    </rule>
-    <rule id="4a5b-4d6b-7a1f-4f0f" name="Zornhau*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>Each Model in the Unit may re-roll Blank Results in Attacks against Surface Units or Ground Units with a Mass of 2 or more.</description>
-    </rule>
-    <rule id="2124-7f95-e436-9982" name="Flack Vierling (NO)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>These quad barrelled weapons are designed to strafe airborne targets, though have proven capable of damaging surface vessels as well. The weapon gains the Sustained Quality against Aerial Units and Skimming Units.</description>
-    </rule>
-    <rule id="744a-5e7c-df1f-95b2" name="Advanced Sturmcoils*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>Sturmklaue on this Unit gain the Sustained Quality while at Closing Range.</description>
-    </rule>
-    <rule id="9933-02a2-c7e4-255e" name="Haddingjar Projector*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>This Model is equipped with a special type of projector that gives its Generators additional power and range. Any Friendly Models within 7” of this Model, with a Mass of 2 or greater, counts as being equipped with the same Generators as this Model. The Projector cannot give Models the benefit from duplicate Generators at any time.</description>
-    </rule>
-    <rule id="e39f-1547-89f1-8481" name="Lightning Raid*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>At the start of the first Round, provided at least one Battlefleet has this rule, the Imperium player creates a stack of Blitzen Bomber SRS Tokens in what is called a Lightning Raid. This stack consists of a Blitzen Bomber SRS Token for each Battlefleet in their Force with this rule. This stack is placed on the ship card of a friendly Flagship of the players choice and may be used in the Operations Step of the First Round when they are stacked in Base Contact with one or more Enemy Models anywhere in the Play Area. Blitzen Bombers are SRS Tokens but contribute 5 Action Dice to Attack Runs. They can be combined with other friendly SRS Tokens in Attack Runs. A Blitzen Bomber SRS Token is removed for every two successes in Interception, but they can only be Intercepted once all other Friendly SRS Tokens have been Intercepted. Any Attack Run that has the majority of the Tokens as Blitzen Bombers has the Sustained, Bomb and Voltaic Qualities. If the number of Blitzen Bomber SRS Tokens in the Attack Run is greater than the Mass of the Attack Run Target, the Action Dice Pool gains the Devastating Quality. Blitzen Bombers cannot make Attack Runs on Aerial Units and must try to find New Targets in this situation (page 26 of the Rules). Up to six additional Blitzen Bomber SRS Tokens may be added to this Lightning Raid stack for +15pts per Token. The stack may be split, but the Tokens may only be used in an Attack Run.</description>
-    </rule>
-    <rule id="d249-8ba2-9c56-69a3" name="Wolves of the Sea*" publicationId="33cf-b4a6-bff0-0d70" hidden="true">
+    <rule id="d249-8ba2-9c56-69a3" name="Wolves of the Sea (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="true">
       <modifiers>
         <modifier type="set" field="hidden" value="false">
           <conditions>
@@ -11434,8 +11521,9 @@ A maximum sized Konrad Support Carrier Unit may be upgraded for +20pts to take t
           </conditions>
         </modifier>
       </modifiers>
-      <description>Crippled Models with this rule still use the Battle Ready value of their Lead weapons. When making (but not Supporting) an Assault, this Model gains a bonus to its Assault Action Dice Pool equal to its Mass value. If all the Models making the Assault have this rule, then the Assault Action Dice Pool may re-roll blank results and gains the Devastating Quality.</description>
+      <description>Crippled Models in this Unit with this rule still use the Battle-Ready value of their weapons. When making (but not Supporting) an Assault, this Model gains a bonus to its Assault Action Dice Pool equal to its Mass value. If all the Models making the Assault have this rule, then the Assault Action Dice Pool may re-roll blank results and gains the Devastating Quality. Furthermore, as the Moving Model in a Ramming Action, this Model does not suffer from Damage or Disorder.</description>
     </rule>
+    <rule id="ce94-1610-aef0-5f0d" name="New Rule" hidden="false"/>
   </sharedRules>
   <sharedProfiles>
     <profile id="67bb-81ef-c745-c513" name="Elector" publicationId="33cf-b4a6-bff0-0d70" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model    ">
diff --git a/Rules.cat b/Rules.cat
index 6300b1f..b1829ad 100644
--- a/Rules.cat
+++ b/Rules.cat
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="edc4-1a6a-03e6-7be9" name="Rules" revision="8" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="edc4-1a6a-03e6-7be9" name="Rules" revision="9" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <comment>Update to ORBAT 3.04 (published 17/08/2023)</comment>
   <readme>Rules collection</readme>
   <sharedRules>
-    <rule id="b846-c841-35ad-caa2" name="Ablative Armour�" publicationId="5a03-1c6f-8fc8-2be1" page="" hidden="false">
+    <rule id="b846-c841-35ad-caa2" name="Ablative Armour (3.04)" publicationId="5a03-1c6f-8fc8-2be1" page="" hidden="false">
       <description>When the Initial Target of an Attack, this Unit can affect a number of Exploding Hit results in the Attack Action Die Pool up to its Mass value. The affected Exploding Hit results do not generate additional Action Dice. Attacks with Piercing, Rail, Ramming or Submerged Qualities ignores this rule.</description>
     </rule>
-    <rule id="940a-68a8-b107-96e4" name="Ablative Flank Armour�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="940a-68a8-b107-96e4" name="Ablative Flank Armour (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>When this Model is Initial Target of an Attack originating from a point in this Model’s Port or Starboard arc, it uses this rule. This Unit can affect a number of Exploding Hit results in the Attack Action Die Pool up to its Mass value. The affected Exploding Hit results do not generate additional Action Dice. Attacks with Piercing, Rail, Ramming or Submerged Qualities ignores this rule.</description>
     </rule>
-    <rule id="2823-33a9-a62b-e29a" name="Ablative Prow Armour�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="2823-33a9-a62b-e29a" name="Ablative Prow Armour (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>When this Model is Initial Target of an Attack originating from a point in this Model’s Fore arc, it uses this rule This Unit can affect a number of Exploding Hit results in the Attack Action Die Pool up to its Mass value. The affected Exploding Hit results do not generate additional Action Dice. Attacks with Piercing, Rail, Ramming or Submerged Qualities ignores this rule.�</description>
     </rule>
-    <rule id="6381-3c0e-84c8-6b3b" name="Advanced Repair Facilities�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="6381-3c0e-84c8-6b3b" name="Advanced Repair Facilities (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Battle-Ready Models in this Unit with this rule may add a number of Action Dice to their own Repair Tests equal to the value of this ability. Furthermore, Models in this Unit with this rule may use their Action Dice Pool to make Repair Tests for Disorder Levels and/or Damage Markers on themselves or any friendly Models within 4&quot;. One or more Exploding Hit results from a Repair Test made by this Model may remove a single point of damage from itself or a Friendly Model within 4&quot;. A Model cannot remove more than a single point of damage per Repair Test. Repair Tests can be made on Models without Levels of Disorder or Damage Markers if desired. If the friendly Model is Crippled, it cannot have damage removed that would return it to a Battle-Ready condition.</description>
     </rule>
-    <rule id="4028-cfc7-f428-5413" name="Aggressive Crew�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="4028-cfc7-f428-5413" name="Aggressive Crew (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>While making an Assault, this Unit may re-roll Blank dice results.</description>
     </rule>
-    <rule id="93e6-1c0e-ac6b-0fc8" name="Agile�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="93e6-1c0e-ac6b-0fc8" name="Agile (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Unless suffering from a Navigation Lock Critical Damage Marker, Models in this Unit with this rule may make turns during Drift movement in the same way as it usually would during normal Movement.</description>
     </rule>
     <rule id="a20c-8d13-4cf3-3990" name="Akron Warning &amp; Control System (no)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>Weapons on this Unit with the Extreme Range Quality gain the Homing Quality if the Initial Target is within 15&quot; of an Akron Observation Rotor.</description>
     </rule>
-    <rule id="1d20-a887-16ac-7f4c" name="Amphibious�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="1d20-a887-16ac-7f4c" name="Amphibious (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit is a Surface Unit after deployment. The Unit can move across Land and Obstacle terrain at normal Speed without suffering damage or collision. It has a Drift of zero when on Land. While this Unit is on Land or Obstacle Terrain, that Terrain is ignored for LOS purposes to and from this Unit.</description>
     </rule>
-    <rule id="ad21-8a8b-501a-f08c" name="Automata Repair Platform*" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
-      <description> Roll an Action Die each time a Mass 1 Friendly AUTOMATA is destroyed within 10” of this Unit. On a roll of a Counter or Heavy Counter the AUTOMATA is not removed and instead remains in play with a single Hull point. </description>
+    <rule id="ad21-8a8b-501a-f08c" name="Automata Repair Platform (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+      <description>Roll an Action Die each time a Mass 1 Friendly AUTOMATA is destroyed within 10” of this Unit. On a roll of a Counter or Heavy Counter the AUTOMATA is not removed and instead remains in play with a single Hull point.</description>
     </rule>
-    <rule id="d894-52c8-4b18-f9f5" name="Armoured Decking�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="d894-52c8-4b18-f9f5" name="Armoured Decking (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Attacks with the Aerial Quality gain a single Hit from a Heavy Hit result rather than the usual two when attacking this Model. Exploding Hits are unaffected by this rule. Attacks with the Piercing Quality ignore this rule.</description>
     </rule>
-    <rule id="e0a4-52b6-676c-9b6d" name="Celerity**" publicationId="d854-a2d6-3d52-44c4" hidden="false">
-      <description>Once per Activation, this Unit may make the following Valour Effect provided the Valour card discarded has a value of at least 40 (including by Valorous Conduct). Each Model in the Unit with this rule, that has caused at least one point of damage in a Ramming Action this Activation, may make a second Ramming Action.</description>
+    <rule id="e0a4-52b6-676c-9b6d" name="Celerity (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+      <description>Once per Activation, this Unit may make the following Valour Effect provided the Valour card discarded has a value of at least 40 (including by Valorous Conduct). Each Model in the Unit with this rule, that has caused at least one point of damage in a Ramming Action this Activation, may make a second Ramming Action</description>
     </rule>
-    <rule id="cfe8-adc4-4866-0bc8" name="Cloud Hunting�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="cfe8-adc4-4866-0bc8" name="Cloud Hunting (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Once per Activation, this Unit gains +2 to an Attack Action Dice Pool for each Model with this rule that contributes to the Attack provided that the Initial target is an Aerial Unit.</description>
     </rule>
-    <rule id="5eca-214c-5274-55db" name="Combat Air Patrol�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="5eca-214c-5274-55db" name="Combat Air Patrol (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Units with this rule may Launch a number of SRS Tokens in the First Round of the Encounter (to a maximum of their Crippled Capacity value) against any Enemy Unit in the Play Area rather than the usual range.</description>
     </rule>
-    <rule id="50d4-3fc7-f4ae-9736" name="Coastal Bombardment�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="50d4-3fc7-f4ae-9736" name="Coastal Bombardment (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Models in this Unit may re-roll blanks when shooting at Ground Units with weapons that have the Gunnery Quality</description>
     </rule>
     <rule id="33d6-3aaa-abe5-bf80" name="Command &amp; Control" hidden="false">
@@ -51,25 +51,25 @@
     <rule id="1c64-d581-925a-6659" name="Command Codes*" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Once per Round the Player may declare they are using Command Codes to immediately cancel all the dice results in any one Action Dice Pool generated by any Friendly Unit within 15” of this Model. The Command Codes must be played before any manipulation of the Action Dice Pool takes place by either Player. The Action Dice pool is then rolled afresh exactly as if the previous Action Dice Pool had not been rolled. You may not cancel part of the Action Dice Pool or another Player’s Action Dice Pool using this rule. </description>
     </rule>
-    <rule id="78c8-6a85-daa7-3625" name="Command Override�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="78c8-6a85-daa7-3625" name="Command Override (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>If a Battlefleet has this rule, once per Encounter the Player may declare they are using the Battlefleet’s Command Override to immediately cancel all the dice results in any one Action Dice Pool generated by Units in the Force. The Command Override must be played before any manipulation of the Action Dice Pool takes place by either Player. The Action Dice pool is then rolled afresh exactly as if the previous Action Dice Pool had not been rolled. You may not cancel part of the Action Dice Pool or another Player’s Action Dice Pool using this rule.</description>
     </rule>
     <rule id="baf3-c66b-7e9a-8002" name="Command Re-Roll" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>If this Battlefleet includes at least one Unit (in addition to the Flagship), the Player gains a Command Re-roll. Each Command Re-roll may be used once per game. It allows all the dice in the Player’s Action Dice Pool (regardless of results) to be re-rolled. You may not re-roll part of the Action Dice Pool or another Player’s Action Dice Pool using this rule, it must be all the dice and only in your own Dice Pool.</description>
     </rule>
-    <rule id="177e-3490-5f5e-f4b9" name="Contra Rotation�" publicationId="5a03-1c6f-8fc8-2be1" page="" hidden="false">
+    <rule id="177e-3490-5f5e-f4b9" name="Contra Rotation (3.04)" publicationId="5a03-1c6f-8fc8-2be1" page="" hidden="false">
       <description>This is a Special Operations Action that may be made by any Model in the Unit with the Paddlewheel Trait unless it has a Navigation Lock Critical Damage Marker or is making another Action requiring the Paddlewheels Trait. The Model making a Contra Rotation Action has a Drift of zero and reduces its Speed Attribute by its Mass for the Activation. At any point during its Movement Step the Model may make a single turn on the spot of up to 90 degrees. It may Move and Turn normally in addition to this Action.</description>
     </rule>
-    <rule id="4836-a907-b316-55b2" name="Corvette Duty�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="4836-a907-b316-55b2" name="Corvette Duty (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Model may add +1 to the Defence Action Dice Pool on any friendly Models within 5”. This bonus is in addition to any other bonuses such as being part of an Attached Unit.</description>
     </rule>
     <rule id="430b-30b3-203e-0d80" name="Defensive Pilots" publicationId="129d-da97-caec-1ddd" hidden="false">
       <description>Friendly SRS Tokens launched by this Unit provide +2 Action Dice to the Defending the Citadel Dice Pool of Friendly Units they are in base contact with rather than the usual +1.</description>
     </rule>
-    <rule id="ecf0-d255-3339-4a1b" name="Disciplined�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="ecf0-d255-3339-4a1b" name="Disciplined (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Models in this Unit ignore the effects of the Emergency Disorder Condition, though still count as having Disorder at that level. Furthermore, in a Ramming Action, this Model does not suffer from Disorder.</description>
     </rule>
-    <rule id="4f7a-f51a-a60e-e6ba" name="Elite Crew�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="4f7a-f51a-a60e-e6ba" name="Elite Crew (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>While making or defending from an Assault, Models in this Unit with this rule may re-roll Blank dice results.</description>
     </rule>
     <rule id="62d5-9d9f-0615-cb34" name="Escort Token*" publicationId="129d-da97-caec-1ddd" hidden="false">
@@ -78,178 +78,178 @@
 - The Escorted Units Defence Action Dice Pools are increased by +1 for each Escort Token with it.
 - One Model in the Escorted Unit’s Assault Action Dice Pool is increased by +1 for each Escort Token with it.</description>
     </rule>
-    <rule id="9ec9-dd04-5a42-6864" name="Focused Gunnery�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
-      <description>A single Attack each Activation led by a Model with this rule with the Gunnery Quality receives +2 Action Dice and may re-roll Blank results.</description>
+    <rule id="9ec9-dd04-5a42-6864" name="Focused Gunnery (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+      <description>A single Attack each Activation, led by a Model with this rule with the Gunnery Quality, receives +2 Action Dice and may re-roll Blank results.</description>
     </rule>
-    <rule id="55be-dbb8-d350-5d2a" name="For Valour!�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="55be-dbb8-d350-5d2a" name="For Valour! (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>After this Unit uses a Valour effect (or has one cancelled by rules such as Fortunes of War), roll an Action Die. On an Exploding Hit, do not discard the card and instead return it to your hand. You cannot use this rule for Valour effects that do not directly involve this Unit. You may only roll once per card.</description>
     </rule>
-    <rule id="e8f8-a4d2-d40c-1467" name="Forward Deployment�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="e8f8-a4d2-d40c-1467" name="Forward Deployment (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Units with this rule can never be held in reserve at the start of an Encounter. They must be deployed anywhere outside of the Encounter’s deployment zones and least 12” from the enemy deployment zone.</description>
     </rule>
-    <rule id="9111-7f5e-6eac-7cbe" name="Full Steam Ahead�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="9111-7f5e-6eac-7cbe" name="Full Steam Ahead (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit may double its Drift during its Movement Step. If it does so it may not make any turns during the same Activation.</description>
     </rule>
-    <rule id="0d99-00ae-4c22-20b7" name="Giant Slayer�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="0d99-00ae-4c22-20b7" name="Giant Slayer (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Each Model in the Unit may re-roll Blank Results in Attacks against an Initial Target with a Mass of 3 or more.</description>
     </rule>
-    <rule id="9f05-9e27-c658-e49f" name="Gun Runner�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="9f05-9e27-c658-e49f" name="Gun Runner (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Units with this rule are adept at providing a steady stream of gunfire as they manoeuvre. To gain benefit of this rule, a Model with this rule must have moved at least 7” during the Activation or been Placed by a Mirage Generator during its Activation. A single Attack each Activation led by a Model with this rule with the Gunnery Quality receives +1 Action Dice for each Battle-Ready Model with this rule contributing to that Attack. Additionally, while Battle-Ready, Models in this Unit with this rule gain +2 Speed during its Movement Step provided that it makes no turns.</description>
     </rule>
-    <rule id="4a79-7f9b-ba17-59b8" name="Hammer Sweep�" publicationId="5a03-1c6f-8fc8-2be1" page="" hidden="false">
+    <rule id="4a79-7f9b-ba17-59b8" name="Hammer Sweep (3.04)" publicationId="5a03-1c6f-8fc8-2be1" page="" hidden="false">
       <description>During its Activation, Models in this Unit with this rule may increase their Speed by 1&quot; and gain +2 to their Ramming Dice Pool if they make no turns during this Movement.</description>
     </rule>
-    <rule id="24cb-6c34-eb5b-7dde" name="Heavy Escort�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="24cb-6c34-eb5b-7dde" name="Heavy Escort (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Model may add +2 to the Defence Action Dice Pool on any friendly Models within 5”. This bonus is in addition to any other bonuses such as being part of an Attached Unit.</description>
     </rule>
-    <rule id="ecfb-a5b5-1cb8-8e39" name="Heavy Firepower�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="ecfb-a5b5-1cb8-8e39" name="Heavy Firepower (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Once per Activation, before declaring an Initial Target, Each Model in this Unit with this rule may make the following Valour Effect. When making an Attack, up to three of that Model’s weapons may contribute their Lead value to the Action Dice Pool, rather than the normal single Lead weapon value. Other Models may support this Attack but cannot benefit from this rule. Models with this rule still only have a single Lead weapon for Disorder purposes etc.</description>
     </rule>
     <rule id="482d-5802-96ca-bd80" name="Ignores Shield Generator" hidden="false">
       <description>The weapon ignores shield generetor effect</description>
     </rule>
-    <rule id="2ae7-9b96-fd1d-ef29" name="Inductorium�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="2ae7-9b96-fd1d-ef29" name="Inductorium (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>When this Unit makes an Attack or Assault with the Voltaic or Arc Quality, count the number of Exploding Hits results once all Attack Dice have been rolled, including additional dice from Exploding Hits. If the number of Exploding Hits exceeds the number of Models in the Target Unit, the Attack gains a bonus number of Action Dice equal to the number of Models in the Target Unit.</description>
     </rule>
-    <rule id="8aa1-f648-12bd-a1c6" name="Immobile�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="8aa1-f648-12bd-a1c6" name="Immobile (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Models with this rule are always deployed at the same time as Aerial Units. Models in this Unit with this rule have a Drift of zero and may not move or be moved. Treat Sturginium Flare Critical Damage as Catastrophic Explosions instead.</description>
     </rule>
-    <rule id="b48d-b4e0-19e8-d85a" name="Inspirational�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
-      <description>Any friendly Model within 10” of a Model with this rule (but not including the Model with this rule itself) may reduce a single Disorder Level at the start of their Activation and may re-roll a single Action die each step of their Activation.</description>
+    <rule id="b48d-b4e0-19e8-d85a" name="Inspirational (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+      <description>Any friendly Model within 10” of a Model with this rule (but not including the Model with this rule itself) may reduce a single Disorder Level at the start of their Activation and may re-roll a single Action dice each step of their Activation.</description>
     </rule>
-    <rule id="4869-03db-33f9-fa82" name="Landing Vessel�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="4869-03db-33f9-fa82" name="Landing Vessel (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Models in this Unit may make a Special Operations Action known as Landing. If this Model comes into contact with terrain identified in the Encounter as a Landing Point, it does not suffer damage and may remain stationary, with a Drift of zero for the Round. Each Model in this Unit may place a number of Ground Assault Tokens equal to its Mass in a stack within 5” of the Landing Point. The Token stack must be placed on Ground Terrain. Once a stack of Ground Assault Tokens has been placed using this Model, then place this Model at least 2” from the Landing Zone in any direction desired. This Model loses the Landing Vessel rule for the remainder of the Encounter.</description>
     </rule>
-    <rule id="565f-36a9-52bb-4e63" name="Launch Catapults�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="565f-36a9-52bb-4e63" name="Launch Catapults (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>SRS Tokens launched by Units with this rule may Launch SRS Tokens and place in base contact with a Friendly or Enemy Unit within 45” rather than the usual 40”.</description>
     </rule>
-    <rule id="db6c-61a0-22a6-0d7a" name="Linear Dash�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="db6c-61a0-22a6-0d7a" name="Linear Dash (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Models in this Unit with this rule gain +2 Speed during its Movement Step provided that it makes no turns.</description>
     </rule>
-    <rule id="0054-ea91-5408-283a" name="Low-Level Strike�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
-      <description>In the Special Operations phase of the round, while battle Ready, this Unit may declare it is making a Low-Level Strike. For the remainder of that Round, the Unit doubles its Drift Movement, ceases to be an Aerial Unit and instead becomes a Skimming Unit. The Unit has +1 Armour while it has the Skimming Unit Positional Trait. A Unit cannot be part of an Attached Unit if making a Low-Level Strike. A Unit cannot make a Low-Level Strike if it has already done so the previous Round. During deployment, any Unit with this rule may deploy as a Skimming Unit making a Low-Level Strike for the first Round (though still counts as an Aerial Unit for battlefleet selection purposes).</description>
+    <rule id="0054-ea91-5408-283a" name="Low-Level Strike (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+      <description>In the Special Operations phase of the Round, while battle Ready, this Unit may declare it is making a Low-Level Strike. For the remainder of that Round, the Unit doubles its Drift Movement, ceases to be an Aerial Unit and instead becomes a Skimming Unit. The Unit has +1 Armour while it has the Skimming Unit Positional Trait. A Unit cannot be part of an Attached Unit if making a Low-Level Strike. A Unit cannot make a Low-Level Strike if it has already done so the previous Round. During deployment, any Unit with this rule may deploy as a Skimming Unit making a Low-Level Strike for the first Round (though still counts as an Aerial Unit for battlefleet selection purposes).</description>
     </rule>
-    <rule id="408e-7b40-68d7-059f" name="Logistical Support�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="408e-7b40-68d7-059f" name="Logistical Support (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit adds +1 to the number of Victory and Valour Cards in a player’s hand. Should this Unit be destroyed, the bonus is lost at the end of the Round. This ability does not stack so multiple Units with this rule still only confers +1 to the hand size in total.</description>
     </rule>
-    <rule id="ed8a-5968-81b4-27d5" name="Malinois Strike Fighters�" publicationId="129d-da97-caec-1ddd" hidden="false">
+    <rule id="ed8a-5968-81b4-27d5" name="Malinois Strike Fighters (3.04)" publicationId="129d-da97-caec-1ddd" hidden="false">
       <description>These are a type of SRS Token with the following differences. Tokens launched by Units with this rule may Scramble up to 10”. Attack Runs by SRS Tokens from Units with this rule have the Hazardous and Piercing Qualities. This rule does not apply to Frelon Levant Bomber SRS Tokens.</description>
     </rule>
-    <rule id="0b7c-6003-8433-2817" name="Maritime Patrol�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="0b7c-6003-8433-2817" name="Maritime Patrol (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Models in this Unit with this rule may ignore the Submerged Unit Position Trait when making Attacks on any Initial Targets within 10” of Models with this rule, or against Initial Targets with at least one SRS Token in base contact that is friendly to this Unit.</description>
     </rule>
-    <rule id="a278-bd16-046d-acb6" name="Mechanical Soul�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="a278-bd16-046d-acb6" name="Mechanical Soul (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit ignores the effects of the Emergency Condition, but counts has having the Disorder Level. Models in the Unit can only support Assaults with +1 AD to Fray.</description>
     </rule>
-    <rule id="3c38-dac5-4a88-5358" name="Mine Sweeper�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="3c38-dac5-4a88-5358" name="Mine Sweeper (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>In the Special Operations step of its Operations Phase, a Unit with this rule may remove a Minefield Marker within 5&quot; of a Model in this Unit.</description>
     </rule>
-    <rule id="940f-44f3-71bf-f26c" name="Mine Layer�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="940f-44f3-71bf-f26c" name="Mine Layer (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Before Submerged Unit Deployment, for each Model in a Unit with this rule, the controlling Player may place a Minefield Marker anywhere in the Play Area provided that it is at least 10” from any Deployment Zone.</description>
     </rule>
-    <rule id="112e-82cb-42a3-83d2" name="Pack Hunter�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="112e-82cb-42a3-83d2" name="Pack Hunter (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This rule applies while the Unit numbers two or more Models. A single Attack or Assault by this Unit each Activation receive +1 action dice for each Model in the Unit. All the models in the Unit must contribute Action Dice to the Dice Pool receiving this bonus.</description>
     </rule>
-    <rule id="cd09-dbc0-dee4-b921" name="Powerslide�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="cd09-dbc0-dee4-b921" name="Powerslide (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Models in this Unit with this rule may make its Drift Movement in a direction up to 90 degrees to Port or Starboard from ahead rather than directly ahead. The Model does not physically change its heading when it does so. This is not considered a Turn.</description>
     </rule>
-    <rule id="4106-315d-4d5c-9e8f" name="Priority Signals�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="4106-315d-4d5c-9e8f" name="Priority Signals (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Once per Round, if the Player with this Battle Ready Unit has a Valour Effect Cancelled in the Play Area, this Player may immediately attempt the Valour Effect again by using the Initiative value of a new card. That card is discarded as normal when making the Valour Effect and can be cancelled as normal if the opponent has a rule that enables them to do so.</description>
     </rule>
-    <rule id="39a7-cb6c-ff50-20f1" name="Radar Relay*" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="39a7-cb6c-ff50-20f1" name="Radar Relay (NO)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>Attacks against Enemy Models within 7” of this Model ignore the Obscured rule.</description>
     </rule>
-    <rule id="4979-45a9-d374-3663" name="Reinforced Waterline�" publicationId="129d-da97-caec-1ddd" hidden="false">
+    <rule id="4979-45a9-d374-3663" name="Reinforced Waterline (3.04)" publicationId="129d-da97-caec-1ddd" hidden="false">
       <description>Attacks with the Submerged Quality gain a single Hit from a Heavy Hit result rather than the usual two when attacking this Model. Exploding Hits are unaffected by this rule. Attacks with the Piercing Quality ignore this rule.</description>
     </rule>
-    <rule id="741b-a6ce-dbe7-9409" name="Shadow Hunter�" publicationId="5a03-1c6f-8fc8-2be1" page="" hidden="false">
+    <rule id="741b-a6ce-dbe7-9409" name="Shadow Hunter (3.04)" publicationId="5a03-1c6f-8fc8-2be1" page="" hidden="false">
       <description>Once both sides have deployed but before any Vanguard moves have been made, the Players take it in turns (in initiative order) to redeploy a Unit in their Force with this rule. Each Unit with this rule may only be redeployed once and must be redeployed in their own Deployment area.</description>
     </rule>
-    <rule id="1d26-a2a2-5fe2-1ff1" name="Shallow Draught�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="1d26-a2a2-5fe2-1ff1" name="Shallow Draught (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit treats Treacherous Water as Open Water.�</description>
     </rule>
-    <rule id="d6e5-57de-cebc-3927" name="Skimmer Transport�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="d6e5-57de-cebc-3927" name="Skimmer Transport (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>During the Reserves Step of any Round where this Model is in the Play Area, when a friendly Mass 1 Skimming Unit of two Models is Activated and is in Reserve, it may be immediately deployed within 2” of this Model rather than using any other deployment options. Once a Skimming Unit has been deployed using this Model, this Model loses the Skimmer Transport rule for the remainder of the Encounter.</description>
     </rule>
-    <rule id="1083-2af1-7bfc-7a55" name="Skyfire�" publicationId="5a03-1c6f-8fc8-2be1" page="" hidden="false">
+    <rule id="1083-2af1-7bfc-7a55" name="Skyfire (3.04)" publicationId="5a03-1c6f-8fc8-2be1" page="" hidden="false">
       <description>Models in this Unit may re-roll blanks when shooting at Aerial Units with weapons that have the Aerial Quality.</description>
     </rule>
-    <rule id="063a-3229-1f27-a3c2" name="Spotter�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="063a-3229-1f27-a3c2" name="Spotter (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>If there is one or more SRS Tokens friendly to this Unit in base contact with the Initial Target, this Unit may re-roll blank results with any weapons with the Extreme Range Quality. Alternatively, this Unit&apos;s Initial Target cannot benefit from being Obscured if the Initial Target has at least one SRS Token friendly to this Unit in base contact with it.</description>
     </rule>
-    <rule id="b8d7-281f-b227-a523" name="SRS Mine Clearance�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="b8d7-281f-b227-a523" name="SRS Mine Clearance (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>During its Operations Step, while placing its SRS Tokens, this Model may also place tokens in contact with a Minefield Marker within 20”. At the end of the Special Operations Step discard an SRS Token and roll an Action Die. On an Exploding Hit, the Minefield Marker is discarded. You may repeat this attempt as many times as there are SRS Tokens remaining in the stack. If the Minefield Marker is discarded, any remaining SRS Tokens in the stack may be placed on another Minefield Marker within 5”to continue a Mine Clearance attempt on that Marker. If there are not any Minefield Markers within 5”, the SRS Tokens remain in place until the End Phase when they may Scramble or Find New Targets.</description>
     </rule>
-    <rule id="e76e-276f-d917-c7a4" name="SRS Portal Strike�" publicationId="d854-a2d6-3d52-44c4" page="" hidden="false">
+    <rule id="e76e-276f-d917-c7a4" name="SRS Portal Strike (3.04)" publicationId="d854-a2d6-3d52-44c4" page="" hidden="false">
       <description>When Launching SRS during the Operations Step, a Unit with this rule with an online Portal Generator may also place an additional Portal Token within 5” of itself. If it does so, any SRS Tokens launched during that Operations Step by the Unit may be placed within 40” of any Portal Token in the Play Area.</description>
     </rule>
-    <rule id="0a26-0b4a-261f-3db0" name="SRS Recon�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="0a26-0b4a-261f-3db0" name="SRS Recon (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>During its Operations Step, before placing its SRS Tokens in Base Contact with Models in the Play Area, a Unit with SRS Capacity may discard one or more tokens. Each SRS token discarded allows the player to discard a Victory and Valour card from their hand and replace it with the top card from their Deck. Unspent tokens may be placed and used as normal.</description>
     </rule>
-    <rule id="12ec-f9c6-b68b-913b" name="Strategic Asset�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="12ec-f9c6-b68b-913b" name="Strategic Asset (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit is worth +1 Victory Point to the Controlling Player of this Unit at the end of the Encounter if it is still in the Play Area. If this Unit is destroyed by an Assault Action, it awards +1 Victory Point to the Controlling Player of the Assaulting Model.</description>
     </rule>
-    <rule id="23f5-7a90-116f-cba1" name="Supply Depot�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="23f5-7a90-116f-cba1" name="Supply Depot (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Any Friendly Model within 7” may remove a single level of Disorder at the start of their Activation. Any Friendly Units that move within 7” of this Unit regain any weapons that were lost in the Encounter because of rolling a blank for the Limited Quality Action Die. Restored weapons must roll for the Limited Quality each time used again as normal.</description>
     </rule>
     <rule id="b23f-e421-17ec-862c" name="Supply Vessel" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Once per turn on their Activation, this Unit may look at the top card from their Victory and Valour Deck. They may discard the card or return it to the top of the deck.</description>
     </rule>
-    <rule id="e89c-d342-c776-60c3" name="Tactical Cavitation�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="e89c-d342-c776-60c3" name="Tactical Cavitation (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This is a Special Operations Action that may be made by any Model in the Unit with the Paddlewheel Trait unless it has a Navigation Lock Critical Damage Marker or is making another Action requiring the Paddlewheels Trait. Tactical Cavitation lasts until the end of the Round. The Model making a Tactical Cavitation Action doubles it Drift and reduces its Speed Attribute by that doubled Drift for the Activation. Submerged Attacks against the Model cannot benefit from the Homing Quality. Furthermore, the Unit is Obscured against Submerged Attacks (even those with the Torpedo Quality) and those attacks cannot benefit from the Homing Quality. The Model may Move and Turn normally in addition to this Action.</description>
     </rule>
-    <rule id="1ea8-5ef6-de30-f3ae" name="Temperamental Design�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="1ea8-5ef6-de30-f3ae" name="Temperamental Design (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit cannot make Jury-Rigged Repairs. When making Repair Rolls affecting this Unit, two successes are required to remove each Critical Damage Marker. Repair Rolls using the Advanced Repair Facilities rule ignores this rule.</description>
     </rule>
-    <rule id="eabd-7cf1-b305-2fdb" name="Terror From Above�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="eabd-7cf1-b305-2fdb" name="Terror From Above (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit may Ram Ground Units and Surface Units, even if it moved less than 3” in the Movement Phase. This Unit adds +3 to its Ramming Dice Pool when making a Ram against Ground Units and Surface Units.</description>
     </rule>
-    <rule id="405a-6e4d-45ad-b188" name="Terror From Belove�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="405a-6e4d-45ad-b188" name="Terror From Belove (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit may Ram Surface Units even if it moved less than 3” in the Movement Phase. This Unit adds +3 to its Ramming Dice Pool when making a Ram against Surface Units.</description>
     </rule>
-    <rule id="f4aa-042e-34e5-1938" name="Unexpected Arrival�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="f4aa-042e-34e5-1938" name="Unexpected Arrival (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Instead of being deployed as normal for the Encounter, this Unit may instead be held in Reserve (see Operations for details). If in Reserve in Round one, the Unit must make a Reserve Roll as normal, however, from Round two, or any subsequent Rounds, this Unit may use this rule to immediately deploy from Reserves. Unlike other Units in Reserve, Units declaring that they are using this rule must Activate and deploy before any other friendly In Play Units. When this Unit uses this rule, it is placed at any point in the Play Area that is at least 2&quot; from the nearest terrain feature. No Model in the Unit can be deployed touching another Model. On the Round it enters play with this rule, Models in the Unit may only fire weapons or Ram using the weapon’s Crippled profile. All Models in an Attached Unit may deploy with this rule if the Partner Unit has it. On the Round after deployment, this Unit may Activate as normal.</description>
     </rule>
-    <rule id="2fcd-3a8e-8d93-52af" name="Useful Freight�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="2fcd-3a8e-8d93-52af" name="Useful Freight (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Once per turn on their Activation, for each Model in this Unit, the controlling Player may look at the top card from their Victory and Valour Deck. They may discard the card or return it to the top of the deck.</description>
     </rule>
-    <rule id="0d1b-0810-3b49-e25e" name="Valorous Conduct�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="0d1b-0810-3b49-e25e" name="Valorous Conduct (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Once per Round, per Battlefleet with this rule, a Unit in this Force may replace the Initiative value of a card being used for a Valour Effect card with the Initiative value of 50.</description>
     </rule>
-    <rule id="f721-8318-3875-0140" name="Vanguard�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="f721-8318-3875-0140" name="Vanguard (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Starting with Player B, after both sides are deployed, each player may choose one of their Units with the Vanguard rule and make a free Move of up to 5&quot;. This is not an Activation and does not have Drift or Turn Limit. Vanguard alternates between Players until all such Units have been selected.</description>
     </rule>
-    <rule id="91f7-3138-f1c6-4770" name="Vigour�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="91f7-3138-f1c6-4770" name="Vigour (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Once per Activation, this Unit may make the following Valour Effect. Models in this Unit with this rule gain the Sustained Quality to their Assault Dice Pool. Furthermore, as the same Valour Effect they gain +6 to Fray if the Initial Target has the Colossus rule.</description>
     </rule>
-    <rule id="449d-0011-bd00-b031" name="Terminator Assault�" publicationId="129d-da97-caec-1ddd" hidden="false">
+    <rule id="449d-0011-bd00-b031" name="Terminator Assault (3.04)" publicationId="129d-da97-caec-1ddd" hidden="false">
       <description>As a Special Operations Action that may be made by this Unit instead of a normal Assault, each Model in this Unit with this rule may place a number of Talon Autogyro Tokens equal to their Mass in contact with an Initial Target up to 20” away. These are Assault Tokens. At the beginning of the End Phase, before SRS Resolution, each Talon Autogyro Token contribute 5 Action Dice to an Assault against that Initial Target. The Talon Autogyro Tokens in base contact form a single stack and count as the Assaulting Model, and they ignore Counter Assaults. Friendly SRS placed in contact with Initial Target may support the Autogyro Token stack in the Assault. All Talon Autogyro Tokens in the stack are discarded at the end of that Assault.</description>
     </rule>
-    <rule id="64d5-ad27-abcc-a217" name="Francisco Solex Projector�" publicationId="129d-da97-caec-1ddd" hidden="false">
+    <rule id="64d5-ad27-abcc-a217" name="Francisco Solex Projector (3.04)" publicationId="129d-da97-caec-1ddd" hidden="false">
       <description>This Model and Friendly Models within 10” of this Unit with a Mass of 2 or greater, counts as being equipped with a Solex Generator.</description>
     </rule>
-    <rule id="f1b0-26eb-f8e8-8d3b" name="Frelon SRS Capacity�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="f1b0-26eb-f8e8-8d3b" name="Frelon SRS Capacity (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>The Battle-Ready Capacity and Crippled Capacity for each Model in this Unit is indicated in parenthesis. Frelon Bombers are a type of SRS Token with the following differences. They are launched with a range of 30” and contribute 5 Action Dice to Attack Runs. They can be combined with other friendly SRS Tokens in Attack Runs. A Frelon SRS Token is removed for every two successes in Interception, but they can only be Intercepted once all other Friendly SRS Tokens have been Intercepted. Any Attack Run that has most of the Tokens as Frelon SRS Tokens has the Sustained, Bomb and Hazardous Qualities. If the number of Frelon SRS Tokens in the Attack Run is greater than the Mass of the Attack Run Target, the Action Dice Pool gains the Devastating Quality. Frelon SRS Tokens cannot make a SRS Recon or SRS Mine Clearance but may use the Combat Air Patrol rule. Frelon SRS Tokens cannot make Attack Runs on Aerial Units and must try to find New Targets in this situation.</description>
     </rule>
-    <rule id="147c-599d-5190-bbaa" name="Legionnaire Assault Pods�" publicationId="129d-da97-caec-1ddd" hidden="false">
+    <rule id="147c-599d-5190-bbaa" name="Legionnaire Assault Pods (3.04)" publicationId="129d-da97-caec-1ddd" hidden="false">
       <description>This Model may make assaults within 6” rather than the usual 4” and ignores the Counter Assault result when making an assault. Furthermore, the Assault by this Model gains the Sustained and Hazardous Qualities. This rule does not apply to Supporting Assaults.</description>
     </rule>
-    <rule id="6b55-0f21-5c85-94cb" name="Lumbering�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="6b55-0f21-5c85-94cb" name="Lumbering (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit has a Drift of 3” and does not suffer Disorder from Collisions. All Gunnery targeting this Unit may re-roll Blank results on the Action Dice. This Unit may make a Full Reverse! Special Operations Action without receiving a Level of Disorder. Any additional levels of Disorder received once at Chaos &amp; Disarray are ignored rather than causing damage.</description>
     </rule>
-    <rule id="ee96-2771-5a22-42bd" name="Cryo-Kometa" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="ee96-2771-5a22-42bd" name="Cryo-Kometa (NO)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>SRS Tokens launched by Units with this rule may re-roll Blank Results on Attack Runs.</description>
     </rule>
-    <rule id="eff5-47db-113b-2340" name="Caspian Overthruster�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="eff5-47db-113b-2340" name="Caspian Overthruster (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>During its Activation, this Model may increase its Speed by the number of inches indicated by the rule. If it does so it may not make any turns during the same Activation. If this Model has Moved at least 10” (including Drift) the Model is Obscured, and weapons with the Aerial Quality gain the Extreme Range Quality. If the Model is Crippled or has Navigation Lock Critical Damage, these rules cannot be used.</description>
     </rule>
     <rule id="a065-0bd2-6d18-98c0" name="Void-Engine Overclock*" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>When using the Unexpected Arrival Rule, this model may be immediately made available for deployment instead of rolling for Reserves. However, after deploying, it suffers a point of damage and receives a level of disorder and the Reactor Leak Critical Damage Marker.</description>
     </rule>
-    <rule id="8e0c-5c25-228a-bccf" name="Cryo-Capacitors�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="8e0c-5c25-228a-bccf" name="Cryo-Capacitors (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>This Unit adds +1 Action Dice and the Sustained Quality to any Cryogenic Blast it makes.</description>
     </rule>
-    <rule id="380b-104f-5cc9-0cf9" name="Kometa Railguns�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="380b-104f-5cc9-0cf9" name="Kometa Railguns (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>Attack Runs by Szabla Swordwing SRS Tokens or any SRS Tokens from Units with this rule gain the Rail Quality against Mass 1 targets. This rule does not apply when making a ‘Torpedo Attack’.</description>
     </rule>
     <rule id="608c-4f10-866a-e5c2" name="Nikel Escort�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
@@ -258,20 +258,20 @@
     <rule id="04e9-d06e-0613-a0b1" name="Alchemical" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false">
       <description>Models without a Disorder Condition damaged by a weapon with this quality receive one Disorder Condition. If a Model is damaged by this weapon and already has a level of Disorder, they do not increase their Disorder and instead suffer a point of damage.</description>
     </rule>
-    <rule id="ae1a-2537-27f6-15ce" name="Mark of Yama*" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false">
+    <rule id="ae1a-2537-27f6-15ce" name="Mark of Yama (3.04)" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false">
       <description>Relentlessly drilled from a young age in coordinated marksmanship, the Empire use fire discipline finish off vulnerable enemy targets. Units with this rule making Attacks with the Aerial Quality gain the Homing Quality against enemy Models with one or more Critical Damage Markers. </description>
     </rule>
-    <rule id="7b45-04f1-34a9-7fa6" name="Chita Submersible Automata" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false">
-      <description>The Chita is an Escort as described on Page 32 of the Rulebook with the following exceptions: The Chita is always a Submerged Unit. Being so nimble, it cannot be targeted except by weapons with the Submerged Quality and only then if it is beyond Point Blank Range. Any Model in a Unit the Chita is attached to can be considered the Parent Model for Movement purposes. Each Chita gives +1 to the Submerged Defence Value of every Model in the Unit. Each Chita gives +2 Action Dice to any Assault Action Dice Pool made by any Models in the same Unit. These Models do not benefit from any of the Special Rules, Generators, or weapons for the Unit they are attached to.</description>
+    <rule id="7b45-04f1-34a9-7fa6" name="Chita Escort Token (3.04)" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false">
+      <description>The Chita Submersible Automata is a special type of Escort Token (see pg 32 of the Dystopian Wars rules). Attacks that cause Catastrophic Explosions can only remove a Chita Escort Token if the Attack has the Submerged Quality.</description>
     </rule>
-    <rule id="04b5-f23d-eaad-b786" name="Moon Pool*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+    <rule id="04b5-f23d-eaad-b786" name="Moon Pool (3.04)" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
       <description>Chita Escorts within 10” of this Model provide +2 to Assault Action Dice Pools rather than the usual +1. Furthermore, roll an Action Die each time a Chita Escort Token is removed from a Unit within 10” of one or more Models with this rule. On a roll of a Counter or Heavy Counter the Chita Escort Token is not removed. Instead, it is placed in Base contact with either this Unit, the Unit the Escort Token was originally lost from or another Friendly Model within 7” of this Unit.</description>
     </rule>
-    <rule id="9ac1-76c5-b9bf-d9ae" name="Huoqiang" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+    <rule id="9ac1-76c5-b9bf-d9ae" name="Huoqiang (W)" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
       <description>A Model armed with these flame throwing weapons can fire in two ways. Its ‘Gout’ profile is used to launch attacks over a wide area with the torrent template. Alternatively, while Battle-Ready, a Model can instead fire the Huoqiang or Heavy Huoqiang using the ‘Blade’ profile.</description>
     </rule>
-    <rule id="35b3-fbe5-344b-853b" name="Cloud-Strike*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
-      <description>Utilising long-range drop fuel tanks, Korean pilots are expert at supporting Empire Battlefleets. A Cloud Strike may be made at the start of the Second and Fourth Rounds of the Encounter for each Battlefleet has this rule. In a Cloud-Strike, the Empire player creates a stack of SRS Tokens, one Token for each Unit in that Battlefleet in the Play Area at the start of that Round. Each stack is placed on a ship card of a Unit in each Battlefleet. They may be used exactly as though they had been launched by the Unit (allowing them to be placed against targets in the Play Area within 20” of the Unit). They may not carry out SRS Missions such as Long Range Sorties. All SRS Tokens used with this rule are discarded at the end of the Second and Fourth Rounds.</description>
+    <rule id="35b3-fbe5-344b-853b" name="Cloud-Strike (3.04)" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>Utilising long-range drop fuel tanks, Korean pilots are expert at supporting Empire Battlefleets. A Cloud Strike may be made at the start of the Second and Fourth Rounds of the Encounter for each Battlefleet has this rule. In a Cloud-Strike, the Empire player creates a stack of SRS Tokens, one Token for each Unit in a Battlefleet with this bonus in the Play Area at the start of that Round. These SRS may be used exactly as though they had been launched by a Unit in the Battlefleet (allowing them to be placed against targets in the Play Area within 40” of any Unit in the Battlefleet). All SRS Tokens in a Cloud-Strike are discarded at the end of the Second and Fourth Rounds.</description>
     </rule>
     <rule id="7c61-a2d5-3def-949f" name="Death From Above" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
       <description>This Unit may Ram any Unit except for those with the Submerged Trait.</description>
@@ -279,17 +279,17 @@
     <rule id="db75-3bb7-ef39-e614" name="Tianlong Battlefleet" publicationId="7b2b-0f56-3962-5ec1" page="3" hidden="false">
       <description>Tianlong Units may replace their Heavy Gun Batteries with Interphase Generators for no additional cost. All Models in the Unit must replace their Heavy Gun Battery with an Interphase Generator if this option is taken. </description>
     </rule>
-    <rule id="95d3-c242-ee78-9b3b" name="Enlightened Science�" publicationId="908d-6feb-2e9e-843b" hidden="false">
+    <rule id="95d3-c242-ee78-9b3b" name="Enlightened Science (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>When a Battle Ready Model in this Unit makes a Repair Test, one or more Exploding Hits results remove a single point of damage from that Model. A Model cannot remove more than a single point of damage with this rule per Activation. Repair Tests can be made on Models without Levels of Disorder or Damage Markers if desired. Furthermore, instead of suffering a Generator Shutdown Critical Damage Result, Models in any Unit with this rule may count the Result as a Sturginium Flare instead.</description>
     </rule>
     <rule id="6e2e-abc9-576c-fdac" name="Physeter Constructs*" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>At the start of the first Round, provided at least one Battlefleet has this rule, the Enlightened player creates a stack of Physeter Construct Tokens in what is called a Physeter Ambush. This stack consists of a Physeter Construct Token for each Battlefleet in their Force with this rule. At the start of the First Round, after all deployment, this stack is Placed in base contact with an enemy Surface Unit or Submerged Unit of the players choice. Each Physeter Construct Token contribute 5 Action Dice to an Assault against that Surface Unit or Submerged Unit when that Unit Activates. The Physeter Construct stack count as the Assaulting Model, and they ignore Counter Assaults. Friendly SRS placed in contact with Surface Unit may support the Physeter Construct Token Assault. Up to four additional Physeter Construct Tokens may be added to this Physeter Ambush stack for +12pts per Token. The stack may not be split, and all Physeter Construct Tokens in the stack are discarded at the end of that Assault. </description>
     </rule>
-    <rule id="3862-7540-3def-6ec1" name="Wavelurker�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="3862-7540-3def-6ec1" name="Wavelurker (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Any Unit with this rule may plunge into a shallow dive during Special Operations Step of its Activation. This is called Wavelurking. All Models in the Unit replaces the Surface Unit Position Trait for the Submerged Unit Position Trait until the end of the Special Operations Step of their next Activation (meaning it cannot be used in consecutive turns). Attacks from a Wavelurking Model count only a single Hit from each Heavy Hit result. A Model immediately ceases to be Wavelurking if it has a Navigation Lock Critical Damage Marker or the Chaos and Disarray Level of Disorder. Units with this rule may start the Encounter as Wavelurking, which means they may be deployed as Submerged Units and are Wavelurking from the start of the Encounter until the end of the Special Operations Step of their Activation in the Second Round. They are still considered Surface Units for Force selection purposes.</description>
     </rule>
-    <rule id="1f47-6b63-aa26-88ab" name="Physeter Ambush" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>At the start of the first Round, provided at least one Battlefleet has this rule, the Enlightened player creates a stack of Physeter Construct Special SRS Tokens in what is called a Physeter Ambush. This stack consists of a Special SRS Token for each Battlefleet in their Force with this rule. This stack is placed on the ship card of any one friendly Unit of the players choice and may be used in the First Round exactly as though they had entered play from a Long-Ranged Sortie. Up to six additional Physeter Construct Special SRS Tokens may be added to this Ambush stack for +22pts per Token. The stack may be split and the Tokens used in attack or defence as usual. All Physeter Construct Special SRS Tokens used with this rule are discarded after the First Round.</description>
+    <rule id="1f47-6b63-aa26-88ab" name="Physeter Ambush (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>At the start of the first Round, provided at least one Battlefleet has this rule, the Enlightened player creates a stack of Physeter Assault Tokens in what is called a Physeter Ambush. This stack consists of a Physeter Assault Token for each Battlefleet in their Force with this rule. At the start of the First Round, after all deployment, this stack is Placed in base contact with an enemy Surface Unit or Submerged Unit of the players choice. Each Physeter Assault Token contribute 5 Action Dice to an Assault against that Surface Unit or Submerged Unit in an Assault Action that takes place in the End Phase just prior to SRS Resolution. The Physeter Assault Token stack count as the Assaulting Model, and they ignore Counter Assaults. Friendly SRS placed in contact with Surface Unit may support the Physeter Assault Tokens. Up to four additional Physeter Assault Tokens may be added to this Physeter Ambush stack for +12pts per Token. The stack may not be split, and all Physeter Assault Tokens in the stack are discarded at the end of that Assault.</description>
     </rule>
     <rule id="6bf1-75b9-38f6-df11" name="Special SRS" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>Each Model in this Unit may launch Special SRS Tokens as per defined capacity (Battle ready / Cripled) each Round. These tokens may only be placed up to 15&quot; from this Unit, rather than the normal 20&quot;.</description>
@@ -306,10 +306,10 @@
     <rule id="fa8d-bf2f-b48a-9183" name="Sturginium Agitators" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>When calculating dice pools, the weapon contributes a number of Action Dice equal to the Target Model’s Mass. This number is multiplied, depending on range band etc. See the Weapon Reference table for details. Sturginium Agitators only ever contribute a single Action Dice when used in Support.</description>
     </rule>
-    <rule id="5a79-12a4-77b3-9619" name="Luminiferous Defences�" publicationId="908d-6feb-2e9e-843b" hidden="false">
+    <rule id="5a79-12a4-77b3-9619" name="Luminiferous Defences (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>Units with this rule may use a Defence Action Dice Pool equal to their Crippled ADV to defend against any attack with the Gunnery, Broadside or Fusillade Qualities. This Defence Action Dice Pool cannot be increased higher than the Unit’s Crippled ADV. Mass 1 Units and Models suffering from Shredded Defences cannot use Luminiferous Defences.</description>
     </rule>
-    <rule id="3825-1f2d-f96e-593b" name="Fearless Fighters" hidden="false">
+    <rule id="3825-1f2d-f96e-593b" name="Fearless Fighters (NO)" hidden="false">
       <description>Hurling their nimble craft into incoming fire to protect their allies, each friendly SRS Token (not Physeter Constructs) in base contact with a friendly Unit provides +2 to ADV when discarded rather than the usual +1.</description>
     </rule>
     <rule id="a357-7d50-fe06-27dc" name="Heavy Capacitors" publicationId="908d-6feb-2e9e-843b" hidden="false">
@@ -321,11 +321,11 @@
     <rule id="6d65-0faf-6155-5cf0" name="Scythe Tricobalt Fuel" hidden="false">
       <description>If an Initial Target has Enlightened SRS Tokens in base contact when it is hit by a Heavy Particle Cannon, you may discard one or more of the SRS Tokens to add +1 Die to the Action Dice Pool for each Enlightened SRS Token discarded.</description>
     </rule>
-    <rule id="80e0-aae4-a28e-ed49" name="Q-Ship*" publicationId="908d-6feb-2e9e-843b" hidden="false">
+    <rule id="80e0-aae4-a28e-ed49" name="Q-Ship (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>Once during the Encounter, at the start of this Unit’s Activation, a single Battle-Ready Claudius of the controlling Player’s choice may be immediately replaced with the Q-Ship (a Plinius, Quintilian or Tacitus Model). Do not carry over any damage sustained by the replaced Claudius. The Q-Ship Activates as part of the Claudius Unit for the remainder of the Encounter. Only one Claudius in a Unit may be replaced in this way. The Q-Ship has a profile exactly as the Model it is represented by, cannot have any upgrades except a generator if it is a Quintilian or Tacitus. The replaced Claudius is removed from play and takes no further part in the Encounter.</description>
     </rule>
-    <rule id="4464-b57f-f7e6-d3e0" name="Limited Capacitors*" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>All Models in this Unit use the Crippled value of the weapon indicated. If the weapon is replaced, then this rule applies to the replacement weapon. </description>
+    <rule id="4464-b57f-f7e6-d3e0" name="Limited Capacitors (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>(Pulse Emitter) All Models in this Unit use the Crippled value of the weapon indicated. If the weapon is replaced, then this rule applies to the replacement weapon. </description>
     </rule>
     <rule id="5344-5860-afdf-57e5" name="Lightning Assault*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
       <description>Any Battle-Ready Model in this Unit attempting an Assault Action gains a bonus to its Assault Action Dice Pool equal to its Mass value. Supporting Models cannot use this rule. If the Battle-Ready Assaulting Model has an online Storm Generator, it gains an additional +2 to its Assault Action Dice Pool.</description>
@@ -333,31 +333,31 @@
     <rule id="ffdc-b456-6269-18ae" name="Vitruvian" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
       <description>This Unit may turn on the spot to face any position during its Movement. It may always Ram, even if it moved less than 3” in the Movement Phase.</description>
     </rule>
-    <rule id="d627-3fd6-8f99-5b37" name="Teutonic Construct*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>While Battle Ready and making a Repair roll, any Exploding Hits results remove a point of damage from this Model. A Crippled Model cannot remove damage using this rule</description>
+    <rule id="d627-3fd6-8f99-5b37" name="Teutonic Construct (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>While Battle Ready and making a Repair roll, any Exploding Hits results remove a point of damage from this Model. A Crippled Model cannot remove damage using this rule.</description>
     </rule>
-    <rule id="3e81-c4db-ebd1-14c6" name="Blitzschlag*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>Once per Activation, this Unit may make the following Valour Effect. Any Model in the Unit with this rule, that has caused at least one point of damage in a Ramming Action this Activation, may make a second Ramming Action. The opponent may always attempt to Cancel this Valour Effect and does not require an additional rule to be able to do so.</description>
+    <rule id="3e81-c4db-ebd1-14c6" name="Blitzschlag (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>Once per Activation, this Unit may make the following Valour Effect provided the Valour card discarded has a value of at least 40 (including by Valorous Conduct). Each Model in the Unit with this rule, that has caused at least one point of damage in a Ramming Action this Activation, may make a second Ramming Action against the same or a new Point of Impact within 3” of the first. The Action Dice Pool for the second Ram is the same as the first. The Moving Model may not make any further movement this Activation if it uses this rule.</description>
     </rule>
-    <rule id="a888-5b4c-4092-6e2a" name="Pycrete Construction*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+    <rule id="a888-5b4c-4092-6e2a" name="Pycrete Construction (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
       <description>Catastrophic Explosions cause this Model to receive three points of damage rather than the usual two. During deployment, this Unit may be placed with part of the Model outside of its deployment zone, provided that the Model is touching the edge of the Play Area furthest from the opponent’s deployment zone.</description>
     </rule>
     <rule id="fbf0-6c31-cb55-ec62" name="Supercharged Munition" hidden="false">
       <description>Once per Activation, when a Model with the Flagship Trait in this Unit leads an Attack using Heavy Volt Gun Batteries or Heavy Rocket Batteries, up to three of those weapons may contribute their Lead value instead of their Support value to the Attack Dice Pool rather than the normal single Lead weapon. Any Gustav Heavy Bombards on this Unit gain +3 to Attack Dice Pools when using this weapon.</description>
     </rule>
-    <rule id="db90-0b63-d0f9-5222" name="Portal Mastery�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="db90-0b63-d0f9-5222" name="Portal Mastery (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>A Model with this rule may, as a Special Operations Action, place a second 40mm Portal Token within 20” of itself. While a Model from this Unit is within 5” of a friendly Portal Token, friendly Units with the Sultanate Trait deploying from Reserve may instead be deployed in base contact with any friendly Portal Token in the Play Area. Each Model in the Reserve Unit must be deployed in base contact with the same Portal Token. Remove the friendly Portal Token once a Reserve Unit has been deployed using it.</description>
     </rule>
-    <rule id="1181-0663-f1c1-9047" name="Give Em Hell�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="1181-0663-f1c1-9047" name="Give Em Hell (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>When this Unit makes an Assault, if the result is a Draw, it is instead considered a Havoc result. Furthermore, this Unit may make a Special Operations Action that it will ‘Give Em Hell’. All weapons with the Gunnery or Fusillade special rule in the Unit gain the Devastating Quality for the duration of its Activation. At the end of the Activation, before the Repair Step, unless the player discards a card from their hand, each Model in the Unit gains a Disorder Condition.</description>
     </rule>
     <rule id="00c9-79f7-de6a-b086" name="Akron Observation (no)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>This Unit is accompanied by an Akron Observation Rotor. The Akron is an Escort as described on Page 32 of the Rulebook with the following exceptions: The Akron is armed with a Rocket Pod and may Lead or Support with this weapon in one attack each Activation made by its Parent Unit. The Akron is not an Aerial Unit but the Model has the Aerial Trait and cannot be collided with. It cannot be targeted unless it is in Point Blank Range or the weapon has the Aerial Quality. The Akron gives +1 to the Defence Attributes of every Model in the Unit. The Akron gives the Extreme Range Quality to any Aerial Weapons in the Unit. An Akron counts as being equipped with any Generators present in the Unit. These Models do not benefit from any of the Special Rules or weapons for this Unit. They are destroyed if this Unit is destroyed.</description>
     </rule>
-    <rule id="2c93-befd-f88b-0881" name="Sharpshooter�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="2c93-befd-f88b-0881" name="Sharpshooter (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>The Citadel of the Initial Target receives a -2 against Attacks with the Gunnery Quality by Models with this rule.</description>
     </rule>
-    <rule id="8df9-9fde-8dae-d24d" name="Field Repair Platform�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="8df9-9fde-8dae-d24d" name="Field Repair Platform (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>Roll an Action Die each time an Akron Observation Rotor or RC-52 Patriot Automata is destroyed within 10” of this Unit. On a roll of a Counter or Heavy Counter the Akron or Patriot is not removed and instead remains in play with a single Hull point.</description>
     </rule>
     <rule id="666c-5e9f-db4b-8f60" name="Heavy Teslacoils" publicationId="e6a1-85d3-8979-7880" hidden="false">
@@ -366,40 +366,40 @@
     <rule id="ca4a-ca3a-b489-d441" name="The White Doves�" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>SRS Tokens launched by Units with this rule are called White Doves SRS Tokens. Any Attack Run including one or more White Doves SRS Tokens add the Arc and Piercing Quality to any Attack Run they participate in, provided they are the majority of the friendly SRS Tokens in the Attack Run.</description>
     </rule>
-    <rule id="7b67-714d-bb2b-6297" name="Flak Barrage�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="7b67-714d-bb2b-6297" name="Flak Barrage (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>At the start of the End Phase, before SRS Resolution, Models in this Unit with this rule may each roll a number of Action Dice indicated by the rule. Remove one Enemy SRS Token that is in contact with this Unit or Friendly Units within 15&quot; for each Exploding Hit result.</description>
     </rule>
-    <rule id="24c5-f8af-aa5d-998e" name="Dirigible Construction�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="24c5-f8af-aa5d-998e" name="Dirigible Construction (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Receiving a Magazine Explosion Critical damage causes two points of damage to be suffered by the Model rather than the usual one.</description>
     </rule>
-    <rule id="97e8-539e-009a-8ee0" name="In Treue Fest*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>Each Attack by Models in this Unit gains +1 to Action Dice Pool when one or more Models with the BAVARIAN Trait Supports their Attack.</description>
+    <rule id="97e8-539e-009a-8ee0" name="In Treue Fest (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>A single Attack or Assault each Activation by this Unit, gains +1 die to its Action Dice Pool per Model with the BAVARIAN Trait contributing to the Pool. All the models in the Unit must contribute Action Dice to the Dice Pool receiving this bonus.</description>
     </rule>
-    <rule id="347f-29f6-295e-e492" name="Storm Vanes*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
-      <description>In the Shooting Phase, a Model with Storm Vanes may make an Attack against an Initial Target within 10” using the crippled Lightning Strike weapon profile. The Attack ignores Shield Generators, Storm Generators, and Shroud Generators. Storm Vanes have a 360 Line of Sight.</description>
+    <rule id="347f-29f6-295e-e492" name="Storm Vanes (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>In the Shooting Phase, a Model with Storm Vanes may make an Attack against an Initial Target within 10” using the crippled Lightning Strike weapon profile. The Attack ignores Shield Generators, and Shroud Generators. Storm Vanes have a 360 Line of Sight.</description>
     </rule>
-    <rule id="f9be-f519-a9c2-f311" name="Colossus�" publicationId="5a03-1c6f-8fc8-2be1" page="" hidden="false">
+    <rule id="f9be-f519-a9c2-f311" name="Colossus (3.04)" publicationId="5a03-1c6f-8fc8-2be1" page="" hidden="false">
       <description>A Model with this rule may turn on the spot to face any position at the end of its Movement. It may Ram Surface Units and Skimming Units. It may make a Ramming Action even if it moves less than 3” in the Movement Phase. As the Moving Model in a Ramming Action, this Model does not suffer from Damage or Disorder.</description>
     </rule>
-    <rule id="950e-974b-d566-0e66" name="Strategic Withdrawal�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="950e-974b-d566-0e66" name="Strategic Withdrawal (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>At the start of the Maintenance Step of the End Phase, unless one or more Models in the Unit has Navigation Lock Critical Damage, this Unit may be placed back into Reserves. If so, Crippled Models in the Unit are immediately destroyed.</description>
     </rule>
-    <rule id="7baa-3e4c-35ea-5614" name="Anti-Air Specialist�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="7baa-3e4c-35ea-5614" name="Anti-Air Specialist (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Models in this Unit with this rule can choose not to count Aerial Units as being a Range Band further away (see Rulebook p.1 - Aerial Units). Instead, Model’s Attacks against Targets with the Aerial Unit Trait may be measured using the actual Range Band indicated for distance. Attacks with the Aerial Quality against Aerial Units gain the Homing Quality.</description>
     </rule>
-    <rule id="21e2-1ad1-65b5-bdc7" name="Auto-Firing Solutions*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+    <rule id="21e2-1ad1-65b5-bdc7" name="Auto-Firing Solutions (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
       <description>Attacks by Volt Gun Batteries and Heavy Volt Gun Batteries on this Model may re-roll blank results.</description>
     </rule>
-    <rule id="949d-d37f-c7c8-1093" name="Fortunes of War�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="949d-d37f-c7c8-1093" name="Fortunes of War (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>You may Cancel Valour Effects in an Encounter where this Unit has at least one Battle Ready Model in the Play Area.</description>
     </rule>
-    <rule id="5b16-04f1-a7a8-d2e0" name="Large Target�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="5b16-04f1-a7a8-d2e0" name="Large Target (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>During the Shooting Step a Model with this rule may be declared to be in more than one Fire Arc, provided that the Attacking Player can draw Line of Sight from that Fire Arc.</description>
     </rule>
-    <rule id="3f21-1511-2bff-8d3b" name="Strategic Reserve�" publicationId="5a03-1c6f-8fc8-2be1" hidden="true">
+    <rule id="3f21-1511-2bff-8d3b" name="Strategic Reserve (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="true">
       <description>Either all Units in this Battlefleet are held in Reserve, or none of them. When rolling for deployment from Reserves, Units in this Battlefleet may cancel the Reserve Action die result rolled and instead treat the result as a Heavy Hit. If they do so, they must use the Crippled profile of their weapons for that Round.</description>
     </rule>
-    <rule id="1042-355a-94f3-b6be" name="Rocket Barrage�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="1042-355a-94f3-b6be" name="Rocket Barrage (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>A single Attack with the Aerial Quality by this Unit each Activation may re-roll blanks and receives +2 Action Dice.</description>
     </rule>
     <rule id="242a-ba21-5de6-5d5c" name="Voltaic Boarding Actions*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
@@ -408,34 +408,31 @@
     <rule id="e3e3-342b-63df-28cb" name="Fury generator (NO)" publicationId="7f09-e243-2307-78d0" hidden="false">
       <description>The Fury Generator provides a huge boost to a vessel’s power system as well as other, more intangible benefits. This Generator gives its Model +2 to its Speed Attribute and +3 to its Fray Attribute.</description>
     </rule>
-    <rule id="8dc5-989b-0ad0-83a3" name="Shroud generator" publicationId="7f09-e243-2307-78d0" page="" hidden="false">
-      <description>These are a variety of technological marvels emitting billowing clouds, shimmering scatter fields or even belching forth noxious blackness to hide the Unit from sight. A Model with this Generator is Obscured.</description>
-    </rule>
-    <rule id="ac3f-24c4-12e2-f3f1" name="Vulnerable Stern�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="ac3f-24c4-12e2-f3f1" name="Vulnerable Stern (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This rule affects Shooting Attacks against this Model, where this Model’s Aft Fire Arc is the closest point to the Model making the Attack. Such Attacks gain the Devastating Quality. After any other effects or Critical Damage Markers have been applied from that Attack, if at least one Point of Damage has been caused by that Attack, inflict a Navigation Lock Critical Damage Marker if the target does not already have one. Attacks with the Blast, Bomb or Magnetic Qualities ignore this rule.</description>
     </rule>
-    <rule id="ae67-f1be-5c85-c984" name="Scutum Mine Layer�" publicationId="129d-da97-caec-1ddd" hidden="false">
+    <rule id="ae67-f1be-5c85-c984" name="Scutum Mine Layer (3.04)" publicationId="129d-da97-caec-1ddd" hidden="false">
       <description>Before Submerged Unit Deployment, for each Model in a Unit with this rule, the controlling Player may place a Minefield Marker anywhere in the Play Area provided that the Marker it is at least 10” from any Deployment Zone.</description>
     </rule>
-    <rule id="799f-1288-d4b1-74ed" name="Majestic Gun Battery" hidden="false">
+    <rule id="799f-1288-d4b1-74ed" name="Majestic Gun Battery (NO)" hidden="false">
       <description>This weapon gains the Extreme Range Quality only when attacking targets at Long Range or further.</description>
     </rule>
-    <rule id="481e-dcda-510f-f32d" name="Submarauder�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="481e-dcda-510f-f32d" name="Submarauder (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit is a Surface Unit after deployment. Instead of being deployed as normal for the Encounter, this Unit may instead be held in Reserve as a Submarauder. On each Round, Submarauders are Activated before all other Units in the Force. During the first Round, a Submarauder does not Roll for deployment when Activated and instead a 50mm Submarauder Marker is placed anywhere in the Play Area outside of either Player’s deployment zone and at least 2” from the nearest Terrain feature. From the second Round onwards when a Submarauder Activates, it is immediately deployed. When a Submarauder is deployed, it must be placed within 10” of any Submarauder Marker or Wreck Marker in the Play Area. You must remove one of your Submarauder Markers each time this happens. No Submarauder Model can be deployed touching another Model. When a Submarauder is deployed it uses the Crippled profile of their weapons for that Round. Unless one or more Models in the Unit has Navigation Lock Critical Damage, at the start of the Maintenance Step of the End Phase this Unit may be removed from the Play Area and become a Submarauder again. Leave a 50mm Submarauder Marker in the position of any one Model in this Unit. The Unit are placed back into Reserves as Submarauders. On subsequent Rounds Submarauders may be deployed again as outlined above and are deployed within 10” of any Submarauder Marker or Wreck Marker.</description>
     </rule>
-    <rule id="6d13-f170-f8c1-8de3" name="Heavy Lander�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="6d13-f170-f8c1-8de3" name="Heavy Lander (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>While Battle-Ready and making a Landing Action, this Unit may deploy a number of Ground Assault Tokens equal to double its Mass value rather than the usual number.</description>
     </rule>
     <rule id="382f-1d77-970d-7e44" name="Advanced Radar Relay (no)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>Attacks against Enemy Models within 10” of this Model ignore the Obscured rule.</description>
     </rule>
-    <rule id="eeec-83ad-eb67-214f" name="Groupthink Piloting*" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>Hurling their nimble craft into incoming fire with no thought to their own survival, each friendly SRS Token launched by this Model requires four Counters to be removed in an Interception, rather than the usual three. SRS Tokens from Units with this rule cannot gain Weight of Fire.</description>
+    <rule id="eeec-83ad-eb67-214f" name="Groupthink Piloting (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>Hurling their nimble craft into incoming fire with no thought to their own survival, each friendly SRS Token launched by this Model requires four Counters to be removed in an Interception, rather than the usual three. SRS Tokens from Units with this rule cannot gain Weight of Fire and cannot use the SRS Mine Clearance rule.</description>
     </rule>
-    <rule id="7889-ee0d-75fa-af56" name="Helion Cohort*" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>This Model may make assaults within 6” rather than the usual 4”. Furthermore, the Assault by this Model gains the Sustained Quality. This rule does not apply to Supporting Assaults</description>
+    <rule id="7889-ee0d-75fa-af56" name="Helion Cohort (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>This Model may make assaults within 6” rather than the usual 4”. Furthermore, the Assault by this Model gains the Sustained Quality. This rule does not apply to Supporting Assaults�</description>
     </rule>
-    <rule id="f015-bcf9-3b35-1936" name="Volatile*" publicationId="908d-6feb-2e9e-843b" hidden="false">
+    <rule id="f015-bcf9-3b35-1936" name="Volatile (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>Catastrophic Explosions cause a Model with this rule to suffer an additional point of damage each time. If a Model in this Unit is destroyed, any other Model within 3” suffer a Catastrophic Explosion.</description>
     </rule>
     <rule id="7876-c127-1536-55b1" name="Orca Attack Runs*" publicationId="908d-6feb-2e9e-843b" hidden="false">
@@ -447,58 +444,58 @@
     <rule id="b548-5d0d-cdce-67af" name="Cetacean Escorts*" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>Cetacean Construct Tokens placed in base contact with Models in Friendly Units up to 20” away count as Escort Tokens for the duration of the Round. They may not be placed in base contact with Mass 1 Friendly Models or Models that are already Escorted. A Unit may not have more than 4 Cetacean Construct Tokens counting as Escort Tokens. As Escort Tokens, Cetaceans may only be destroyed if the triggering Attack contains the Submerged Quality.</description>
     </rule>
-    <rule id="bc38-977b-093e-9fb8" name="Lamarckian Barracks*" publicationId="908d-6feb-2e9e-843b" hidden="false">
+    <rule id="bc38-977b-093e-9fb8" name="Lamarckian Barracks (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>Assaults by this Unit have the Sustained, Hazardous and Devastating qualities.</description>
     </rule>
-    <rule id="f5c1-43d6-e9a5-bec7" name="Void Shepherd" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>Provided that it has not deployed this Round, at the start of the Maintenance Step of the End Phase, this Unit and any Friendly Units with one or more Models within 5” of this Unit may be placed back into Reserves. Any Crippled Models in any of the Units involved are immediately destroyed if they do so. </description>
+    <rule id="f5c1-43d6-e9a5-bec7" name="Void Shepherd (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>Provided that it has not deployed this Round, at the start of the Maintenance Step of the End Phase, this Unit and any Friendly Units with one or more Models within 5” of this Unit may be placed back into Reserves. Any Crippled Models in any of the Units involved are immediately destroyed if they do so.</description>
     </rule>
-    <rule id="0b78-1d53-06c0-1b42" name="Levant Surge�" publicationId="129d-da97-caec-1ddd" hidden="false">
+    <rule id="0b78-1d53-06c0-1b42" name="Levant Surge (3.04)" publicationId="129d-da97-caec-1ddd" hidden="false">
       <description>Attacks with the Submerged Quality gain a single Hit from a Heavy Hit result rather than the usual two when attacking this Model. Exploding Hits are unaffected by this rule. In the Special Operations phase of the round, while battle Ready, this Unit may make a Levant Surge. For the remainder of that Round, the Unit is Obscured, doubles its Drift, ceases to be a Skimming Unit, and instead becomes an Aerial Unit. A Unit cannot make a Levant Surge if it has already done so the previous Round or if it is part of an Attached Unit where not all Models have this rule. During deployment, any Unit with this rule may deploy as an Aerial Unit making a Levant Surge for the first Round (though still counts as Skimming Unit for battlefleet selection purposes).</description>
     </rule>
-    <rule id="1108-5d87-5267-d3a4" name="Protected Gun Crews�" publicationId="129d-da97-caec-1ddd" hidden="false">
+    <rule id="1108-5d87-5267-d3a4" name="Protected Gun Crews (3.04)" publicationId="129d-da97-caec-1ddd" hidden="false">
       <description>Crippled Models with this rule still use the Battle-Ready value of their weapons with the Gunnery or Broadside Qualities. This rule cannot be used if the Model has the Chaos and Disarray Disorder Condition and has no effect on supporting with the Coordinated Support rule.</description>
     </rule>
-    <rule id="e869-352b-8f2a-e3fd" name="Conscripted Crew�" publicationId="129d-da97-caec-1ddd" hidden="false">
+    <rule id="e869-352b-8f2a-e3fd" name="Conscripted Crew (3.04)" publicationId="129d-da97-caec-1ddd" hidden="false">
       <description>This Unit counts Heavy Counters or Heavy Hits as a single success rather than two when involved in Assaults.</description>
     </rule>
-    <rule id="ad15-2a18-161b-7a44" name="Azhdaya Berserkers�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="ad15-2a18-161b-7a44" name="Azhdaya Berserkers (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>Assaults by this Unit have the Hazardous and Devastating qualities.</description>
     </rule>
     <rule id="6810-cad9-66bc-bada" name="Terror From Above (NO)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>This Unit may Ram Ground Units and Surface Units, even if it moved less than 3” in the Movement Phase. This Unit adds +3 to its Ramming Dice Pool when making a Ram against Ground Units and Surface Units.</description>
     </rule>
-    <rule id="48ec-1da0-8d75-61fa" name="The Traitor’s Mark**" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="48ec-1da0-8d75-61fa" name="The Traitor’s Mark (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>This Unit awards +1 Victory Point to your opponent if it destroyed by a Unit with the Enlightened Trait.</description>
     </rule>
-    <rule id="ad55-c026-6154-8aed" name="Experimental Generator Ship�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="ad55-c026-6154-8aed" name="Experimental Generator Ship (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>Any Friendly Models with a Final Position within 7” of this Unit, with a Mass of 2 or greater, counts as being equipped with the same Generators as this Model. This Unit cannot have more than one of any Generator type. It cannot give any Unit the benefit from any Generator type more than once at any time. If this Unit is Destroyed, it inflicts a Catastrophic Explosion on all Friendly Models within 4”.�</description>
     </rule>
-    <rule id="2ccb-35c3-ed87-3d9d" name="Seismic Pounding�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="2ccb-35c3-ed87-3d9d" name="Seismic Pounding (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>A single Attack with the Hazardous Quality by this Unit each Activation receives +2 Action Dice.</description>
     </rule>
-    <rule id="7f30-a427-0677-d65f" name="Davka�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="7f30-a427-0677-d65f" name="Davka (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>Once at any point during its Activation, instead of making a normal Ramming Action, this Unit may make the following Action as a Valour Effect. Using its fist, this Model may grab an Initial Target within 3” and make a Ramming Action using its Semyenov Assault Bore. The Ram receives a +10 Action Dice bonus instead of any bonus for Ramming distance.</description>
     </rule>
-    <rule id="db24-5758-df5a-19a5" name="Razrez**" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
-      <description>Once per Activation, this Unit may make the following Action as a Valour Effect provided the Valour card discarded has a value of at least 30 (including by Valorous Conduct). Each. Any Claw Arc Projectors may be used in the Shooting Phase in the Fore Arc to make an Attack against an Initial Target within 10” using the Furnace Cascade weapon profile.</description>
+    <rule id="db24-5758-df5a-19a5" name="Razrez (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+      <description>Once per Activation, this Unit may make the following Action as a Valour Effect provided the Valour card discarded has a value of at least 30 (including by Valorous Conduct). Any Claw Arc Projectors may be used in the Shooting Phase in the Fore Arc to make an Attack against an Initial Target within 10” using the Furnace Cascade’s weapon profile.</description>
     </rule>
-    <rule id="da8d-c041-fd15-a8de" name="Devil’s Own Luck�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="da8d-c041-fd15-a8de" name="Devil’s Own Luck (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Once per Round, you may Cancel a Valour Effect in an Encounter where a Model with this rule is in the Play Area. The controlling Player of a Model with this rule must discard a Victory &amp; Valour card from their hand of any value rather than having to be of a greater combined value than the card being Cancelled.</description>
     </rule>
-    <rule id="cb43-2f0f-12ae-7181" name="Sonic Amplifier�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="cb43-2f0f-12ae-7181" name="Sonic Amplifier (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>Attacks made with Hazardous Quality by Models in this Unit gain +3 to their Attack Dice Pool and the Devastating Quality. Shockwave Pulses by this Model always use the larger Torrent template instead of the Small one.</description>
     </rule>
-    <rule id="422e-0279-5ff5-c279" name="Command Codes�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="422e-0279-5ff5-c279" name="Command Codes (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Once per Round the Player may declare they are using Command Codes to immediately cancel all the dice results in any one Action Dice Pool generated by any Friendly Unit within 15” of this Model. The Command Codes must be played before any manipulation of the Action Dice Pool takes place by either Player. The Action Dice pool is then rolled afresh exactly as if the previous Action Dice Pool had not been rolled. You may not cancel part of the Action Dice Pool or another Player’s Action Dice Pool using this rule.</description>
     </rule>
-    <rule id="d7c8-6542-e5a8-d948" name="Kinetic Dampers�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="d7c8-6542-e5a8-d948" name="Kinetic Dampers (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>This Unit may make a Full Reverse! Special Operations Action without receiving a Level of Disorder. Any additional levels of Disorder received once at Chaos &amp; Disarray are ignored rather than causing damage.</description>
     </rule>
     <rule id="495f-f4ed-3ef8-a354" name="Ukranian Battlefleet Bonus�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>Units with the Slava Ukraini! rule in this Battlefleet may re-roll all Action Dice in Assaults.</description>
     </rule>
-    <rule id="98e2-8cce-d8ee-15ad" name="Icebreaker Battlefleet bonus�" publicationId="e265-8c7f-a4b2-a48e" hidden="true">
+    <rule id="98e2-8cce-d8ee-15ad" name="Icebreaker Battlefleet bonus (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>Cryo Generators in the Battlefleet may roll two dice and discard one die for determining Iceberg formation.</description>
     </rule>
     <rule id="dac4-8eec-5ae6-9a96" name="Tail Gunners" publicationId="dbca-8d57-b848-457e" hidden="false">
@@ -510,220 +507,211 @@
     <rule id="22ba-1488-2237-c913" name="Advanced Repair Teams (NO)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>This Unit may add two additional Action Dice to its Repair Test. This is in addition to those given by the Model’s Mass.</description>
     </rule>
-    <rule id="0a8e-d42a-454f-e75c" name="Unstoppable�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="0a8e-d42a-454f-e75c" name="Unstoppable (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>After this Model performs a Ramming action, it is removed from the Play area before disengaging and is Placed the other side of the Impacted Model, retaining its facing as though it had just passed through the Impacted Model and emerged the other side.</description>
     </rule>
-    <rule id="e4c0-65b1-6461-2f51" name="No.1 Squadron�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="e4c0-65b1-6461-2f51" name="No.1 Squadron (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>SRS Tokens launched by Units with this rule are called Number One Squadron SRS Tokens. Any Attack Run including one or more Number One Squadron SRS Tokens has the Sustained and Piercing Qualities, provided that the Number One Squadron SRS Tokens are the majority of friendly SRS Tokens in the Attack Run. Number One Squadron SRS Tokens can only be intercepted if there are no other SRS Tokens remaining to make an Attack Run on the same target.</description>
     </rule>
-    <rule id="4e80-1d7c-8f72-bb13" name="McCurdy Shield Amplifier�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="4e80-1d7c-8f72-bb13" name="McCurdy Shield Amplifier (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>Any Model with a Guardian Generator within 7” of one or more Models with this rule gains +1 to their Guardian Point value. A Model cannot benefit from this bonus multiple times.</description>
     </rule>
-    <rule id="6158-153b-d320-6060" name="Auxiliary Mine Layer�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="6158-153b-d320-6060" name="Auxiliary Mine Layer (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Before Submerged Unit Deployment, the controlling Player of this Unit may place a single Minefield Marker anywhere in the Play Area provided that it is at least 10” from any Deployment Zone.</description>
     </rule>
-    <rule id="806d-f937-7b54-eae9" name="Shrapnel�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="806d-f937-7b54-eae9" name="Shrapnel (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>The first Critical Damage result caused by an attack from this Unit is Shredded Defences. If the target is already suffering from Shredded Defences, then Critical Damage must be rolled as normal.</description>
     </rule>
-    <rule id="d3de-889d-63a3-56bb" name="Snowbird Strike�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="d3de-889d-63a3-56bb" name="Snowbird Strike (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>Utilising specially modified single seater Defiant fighters known as Snowbirds, Canadian pilots are expert at running long range combat air patrols in support of their Battlefleets. A Snowbird Strike may be made at the start of the Second and Fourth Rounds of the Encounter. In a Snowbird Strike, the Crown player creates a stack of SRS Tokens, one Token for each Unit in that Battlefleet in the Play Area at the start of that Round. They may be used exactly as though they had been launched by a Unit in the Battlefleet (allowing them to be placed against targets in the Play Area within 40” of any Unit in the Battlefleet). They may be combined with other SRS Tokens. All SRS Tokens in a Snowbird Strike are discarded at the end of the Second and Fourth Rounds.</description>
     </rule>
-    <rule id="04ee-5a1c-f3c8-3e5f" name="Rocketeer Flight�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="04ee-5a1c-f3c8-3e5f" name="Rocketeer Flight (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>This Unit may launch an Assault against an enemy Model if it is within 6&quot; of it, instead of the usual 4&quot;.</description>
     </rule>
-    <rule id="4f0b-ae8b-9840-cbe0" name="Devil’s Own Luck*" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
-      <description>Once per Round, you may Cancel a Valour Effect in an Encounter where this Unit is in the Play Area. The controlling Player of this Unit must discard a Victory &amp; Valour card from their hand of any value rather than having to be of a greater combined value than the card being Cancelled.</description>
-    </rule>
-    <rule id="8543-0d7a-9a4f-8b17" name="Veteran Repair Teams�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="8543-0d7a-9a4f-8b17" name="Veteran Repair Teams (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit may add two additional Action Dice to its Repair Test. This is in addition to those given by the Model’s Mass.</description>
     </rule>
     <rule id="6b16-eaab-a295-2ab3" name="Terror From Below (NO)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>This Unit may Ram Surface Units even if it moved less than 3” in the Movement Phase. This Unit adds +3 to its Ramming Dice Pool when making a Ram against Surface Units.</description>
     </rule>
-    <rule id="6f17-ddcb-35bc-4e97" name="Reliable Design�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="6f17-ddcb-35bc-4e97" name="Reliable Design (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>This Unit may add an additional Action Die to its Repair Test. This is in addition to those given by the Model’s Mass. Furthermore, this Unit may re-roll Jury-Rigged Repairs.</description>
     </rule>
     <rule id="9f0c-1181-e9a6-84a7" name="Defiant Tail Gunners" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>This rule applies to all SRS Tokens launched by this Unit. You may re-roll Interception Action Dice Pool blank results.</description>
     </rule>
-    <rule id="25ea-b812-952e-dd7d" name="Guardian Surge�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="25ea-b812-952e-dd7d" name="Guardian Surge (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>As a Valour Effect, Models with this rule may double its contribution to the Guardian Points Pool provided the Valour card discarded has a value of at least 40 (including by Valorous Conduct).</description>
     </rule>
-    <rule id="d7bf-054e-82a4-bec0" name="Torpedo Master-Calculator�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="d7bf-054e-82a4-bec0" name="Torpedo Master-Calculator (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>A single Attack with the Torpedo Quality by this Unit each Activation receives +2 Action Dice and gains the Devastating Quality.</description>
     </rule>
-    <rule id="db2e-417f-31d3-8909" name="Unexpected Air Strike�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="db2e-417f-31d3-8909" name="Unexpected Air Strike (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>Instead of being deployed as normal for the Encounter, this Unit may instead be held in Reserve (see Operations for details). Roll to arrive by Reserves as normal, however, from the start of Round two, or the start of any subsequent Rounds, this Unit may automatically arrive from Reserves. When it arrives from Reserves the Unit is placed at any point in the Play Area that is at least 5&quot; from the nearest terrain feature. No Model in the Unit can be deployed touching another Model. On the Round it enters play with this rule, this Unit immediately launches a number of SRS Tokens up to its Capacity value against any Enemy Unit in the Play Area rather than the usual range.</description>
     </rule>
     <rule id="b5f3-e99d-c5c2-5670" name="Armour of Contempt" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>This Unit treats the effects of Chaos and Disarray as the effects of Emergency instead. The Units still counts has having the Chaos and Disarray Level so receiving a further Disorder Condition causes damage as normal.</description>
     </rule>
-    <rule id="563e-1c6c-a525-6552" name="Royal Engineers�" publicationId="dbca-8d57-b848-457e" hidden="false">
-      <description>This Unit counts Blank results as a Counter when making Repair Rolls. Furthermore, Actions with the Gunnery Quality gain +1 to their Lead Action Dice value when two or more weapons Support their Action Dice Pool.</description>
+    <rule id="563e-1c6c-a525-6552" name="Royal Engineers (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
+      <description>This Unit counts Blank results as a Counter when making Repair Rolls. Furthermore, Actions with the Gunnery or Broadside Qualities gain +1 to their Lead Action Dice value when two or more weapons Support their Action Dice Pool.</description>
     </rule>
     <rule id="9a64-1af1-2f0b-358f" name="Vail Midget Subs*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
       <description>The Battle-Ready Capacity / Crippled Capacity of each Model in this Unit is indicated in parenthesis. Each Model in this Unit may place the indicated number of Vali Midget Sub Tokens up to 20&quot; from this Model in base contact with an enemy Model. Vali Midget Subs can make Attack Runs like SRS Tokens, but with 5 Action Dice. The Attack Run has the Homing, Piercing and Submerged Qualities. Vali Midget Sub cannot be intercepted. They cannot make Attack Runs on Aerial Units and must try to find New Targets if this situation arises (page 26 of the Rules).</description>
     </rule>
-    <rule id="6794-8df4-1ec4-3ae8" name="Power Transfer Generator*" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>Each time any Friendly Model within 4” of a Model in this Unit contributes to an Action, it may add three Action Dice to the Action Dice Pool. The Model in this Unit that was closest to that Friendly Model suffers a Level of Disorder. This Model and Units within 5” of this Model may also re-roll blank a result on a single Action Die when using a Turbo Encabulation Drive.</description>
+    <rule id="6794-8df4-1ec4-3ae8" name="Power Transfer Generator (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>Each time any Friendly Model within 4” of a Model in this Unit contributes one or more Action Dice to any Attack or Defence Action Dice Pool, it may add three additional Action Dice to that Action Dice Pool. This Model suffers a Level of Disorder. Once per Round, this Model, or a Model within 5” of this Unit, may make the following Valour Effect and re-roll a single blank result on a Turbo Encabulation roll.</description>
     </rule>
-    <rule id="baf8-76bc-cc99-bd84" name="Numerous*" publicationId="908d-6feb-2e9e-843b" hidden="false">
+    <rule id="baf8-76bc-cc99-bd84" name="Numerous (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>Rather than the usual restriction of only including a single unit of each type, any Battlefleet in this Faction that that can include Units with this Position Trait may instead include up to two of this Unit.</description>
     </rule>
-    <rule id="958a-c386-b88c-bdfe" name="Nemesis Protocol�" publicationId="908d-6feb-2e9e-843b" hidden="false">
+    <rule id="958a-c386-b88c-bdfe" name="Nemesis Protocol (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>Once per Activation, this Unit may make the following Valour Effect provided the Valour card discarded has a value of at least 40 (including by Valorous Conduct). Instead of using it as Ramming weapon this Activation, any Ceous Shockmaw may be used in the Shooting Phase in the Fore Arc to make an Attack against an Initial Target with the Heavy Particle Cannon weapon profile. The Attack ignores Shield Generators, Storm Generators, Guardian Generators and Shroud Generators.</description>
     </rule>
-    <rule id="902a-02ab-5754-084d" name="Apocalypse Protocol�" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>Once per Activation, this Unit may make the following Action as a Valour Effect provided the Valour card discarded has a value of at least 40 (including by Valorous Conduct). Each Crippled Model in this Unit may be immediately destroyed. Each Model destroyed in this manner automatically inflicts a Catastrophic Explosion on a Model within 2”.�</description>
+    <rule id="902a-02ab-5754-084d" name="Apocalypse Protocol (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>Once per Activation, this Unit may make the following Action as a Valour Effect provided the Valour card discarded has a value of at least 40 (including by Valorous Conduct). Each Crippled Model in this Unit may be immediately destroyed. Each Model destroyed in this manner automatically inflicts a Catastrophic Explosion on a Model within 2”.</description>
     </rule>
-    <rule id="53ad-7286-fd8e-bea9" name="Agitation Harmoniser*" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>Attacks made with Agitation Quality by Models in this Unit gain +3 to their Attack Dice Pool and the Sustained Quality.</description>
+    <rule id="53ad-7286-fd8e-bea9" name="Agitation Harmoniser (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>Weapons with Agitation Quality in this Unit use their Battle-Ready value even if the Model is Crippled, gain +3 to their Attack Dice Pool and gain the Sustained Quality.</description>
     </rule>
-    <rule id="1b80-20ba-6dae-7094" name="Hydrophone Relay�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="1b80-20ba-6dae-7094" name="Hydrophone Relay (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Attacks against Enemy Models within 7” of this Model ignore the Obscured rule.</description>
     </rule>
-    <rule id="84f6-ec74-541c-ffd7" name="Infrasound Detector�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="84f6-ec74-541c-ffd7" name="Infrasound Detector (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Attacks against Enemy Models within 10” of this Model ignore the Obscured rule.</description>
     </rule>
-    <rule id="c874-c077-64e1-e63f" name="Rostrata�" publicationId="129d-da97-caec-1ddd" hidden="false">
-      <description>Resolve the Attack as normal with a Rostratum Naval Ballista. If the Initial Target suffers one or more points of damage, then the Unit making the Attack may make a Valour Effect against an Initial Target of the same Mass or less than the Model making the Attack. As a Valour Effect, the Initial Target receives a Level of Disorder and may be turned up to 90 degrees to a facing of the Attacker’s choosing.</description>
+    <rule id="c874-c077-64e1-e63f" name="Rostrata (3.04)" publicationId="129d-da97-caec-1ddd" hidden="false">
+      <description>Resolve the Attack as normal with a Rostratum Naval Ballista. If the Initial Target suffers one or more points of damage, then the Unit making the Attack may make a Valour Effect against an Initial Target of the same Mass or less than the Model making the Attack. As a Valour Effect, the Initial Target receives a Level of Disorder and may be turned up to 90 degrees to a facing of the Attacker’s choosing.�</description>
     </rule>
-    <rule id="f07b-4636-21d5-ac87" name="Accetable Attrition�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="f07b-4636-21d5-ac87" name="Accetable Attrition (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>Provided it numbers 4 Models or less at the start of the Encounter, Destroying this Unit does not confer a Squadron Killer Victory Point bonus.�</description>
     </rule>
-    <rule id="d1aa-3acc-11cb-5002" name="HEC Contractor�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="d1aa-3acc-11cb-5002" name="HEC Contractor (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>This Model may add +2 to the Defence Action Dice Pool on any friendly Models within 5”. This bonus is in addition to any other bonuses such as being part of an Attached Unit. The HEC Contractor Rule only applies during each Round where the Force this Unit is part of had equal to or less Victory Points than their opponents at the most recent Check for Victory Step.</description>
     </rule>
-    <rule id="b15d-ad13-dfd5-2f24" name="Aerial Attachment�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="b15d-ad13-dfd5-2f24" name="Aerial Attachment (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>This Aerial Unit may choose a partner Unit with any Position Trait except the Submerged Unit trait.</description>
     </rule>
-    <rule id="fdd3-3abf-14fe-d2de" name="Co-ordinate Support�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="fdd3-3abf-14fe-d2de" name="Co-ordinate Support (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Models using weapons in Support of a single Lead weapon in an Attack may use this rule. The Model may Support with any weapon rather than needing to match all the Qualities. Weapons used in Support in this way have their own Qualities ignored and simply increase the Attack Dice Pool by the value indicated for their Crippled Support at that range. Ramming weapons may not use this rule. Weapons with the Submerged Quality cannot use this rule in Attacks against Aerial Units. Weapons with the Aerial Quality cannot use this rule in Attacks against Submerged Units.</description>
     </rule>
-    <rule id="6336-229a-7ed6-bb3d" name="Rebel Yell�" publicationId="129d-da97-caec-1ddd" hidden="false">
+    <rule id="6336-229a-7ed6-bb3d" name="Rebel Yell (3.04)" publicationId="129d-da97-caec-1ddd" hidden="false">
       <description>Crippled Models with this rule still use the Battle Ready value of their weapons. This rule cannot be used if the Model has the Emergency or Chaos and Disarray Disorder Condition. The Unit ignores the Conscripted Crew rule when making or defending an Assault against a Unit with the Union Trait.</description>
     </rule>
-    <rule id="6682-4372-1977-72dc" name="Sabre Rattle�" publicationId="129d-da97-caec-1ddd" hidden="false">
+    <rule id="6682-4372-1977-72dc" name="Sabre Rattle (3.04)" publicationId="129d-da97-caec-1ddd" hidden="false">
       <description>Once both sides have deployed but before any Vanguard or Shadow Hunter moves have been made, Units in this Battlefleet may be redeployed provided that their new position is closer to an enemy Unit than before this redeployment. Each Unit in this Battlefleet may only be redeployed once and must be redeployed in their own Deployment area.</description>
     </rule>
-    <rule id="2b18-f139-f57c-e36c" name="Devil’s Own Luck*" publicationId="e6a1-85d3-8979-7880" hidden="false">
-      <description>Once per Round, you may Cancel a Valour Effect in an Encounter where this Unit is in the Play Area. The controlling Player of this Unit must discard a Victory &amp; Valour card from their hand of any value rather than having to be of a greater combined value than the card being Cancelled.</description>
-    </rule>
-    <rule id="77fc-8a38-b1e1-b921" name="Talon Assault�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="77fc-8a38-b1e1-b921" name="Talon Assault (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>At the start of the first Round, provided at least one Battlefleet has this rule, the Union player creates a stack of Talon Autogyro Tokens in what is called a Talon Assault. This stack consists of a Talon Autogyro Token for each Battlefleet in their Force with this rule. At the start of the First Round, after all deployment, this stack is Placed in base contact with an enemy Unit of the players choice (not Submerged Units). At the beginning of the End Phase, before SRS Resolution, each Talon Autogyro Token contribute 5 Action Dice to an Assault against that Surface Unit, Skimming Unit or Ground Unit when it Activates. The Talon Autogyro stack count as the Assaulting Model, and they ignore Counter Assaults. Friendly SRS placed in contact with Surface Unit may support the Autogyro Token Assault. Up to four additional Talon Autogyro Tokens may be added to this Talon Assault stack for +12pts per Token. The stack may not be split, and all Talon Autogyro Tokens in the stack are discarded at the end of that Assault.</description>
     </rule>
-    <rule id="0875-9929-1e1f-a032" name="Semper Fortis�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="0875-9929-1e1f-a032" name="Semper Fortis (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>Union commanders are trained to take advantage of evolving situations. After a Force with this Unit in play uses a card for a Valour Effect (or has the Valour Effect Cancelled and is forced to discard a card), roll an Action Die. On an Exploding Hit, do not discard the Victory &amp; Valour card and instead return it to your hand.  You may only roll once per card. </description>
     </rule>
     <rule id="bb97-492e-cd55-2f87" name="Fighting Spirit (NO)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>When this Unit makes an Assault, if the result is a Draw, it is instead considered a Havoc result.</description>
     </rule>
-    <rule id="ee33-07eb-77e7-c5aa" name="Flashlamps�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="ee33-07eb-77e7-c5aa" name="Flashlamps (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>Models in this Unit retain a Coherency of 5” rather than the usual 4”. Models in the same Unit may contribute to a Defence Dice Pool if within 5” rather than the usual 4”. If the Joining Unit has this rule but the Partner Unit does not, then the Attached Unit gains the rule.</description>
     </rule>
-    <rule id="04d4-35c8-b8b2-c9a0" name="Pacifier Assault�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="04d4-35c8-b8b2-c9a0" name="Pacifier Assault (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>As a Special Operations Action that may be made by this Unit instead of a normal Assault, each Model in this Unit with this rule may place a number of Talon Autogyro Tokens equal to their Mass in contact with an Initial Target up to 20” away. These are Assault Tokens. At the beginning of the End Phase, before SRS Resolution, each Talon Autogyro Token contribute 5 Action Dice to an Assault against that Initial Target. The Talon Autogyro Tokens in base contact form a single stack and count as the Assaulting Model, and they ignore Counter Assaults. Friendly SRS placed in contact with Initial Target may support the Autogyro Token stack in the Assault. If the result of an Assault by Talon Autogyro Tokens is a Draw, it is instead considered a Havoc result. All Talon Autogyro Tokens in the stack are discarded at the end of that Assault.</description>
     </rule>
-    <rule id="8b20-d253-2052-6591" name="Akron Escort Duty�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="8b20-d253-2052-6591" name="Akron Escort Duty (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>At the start of its Activation, if this Unit consists of a single Model, it is immediately removed from the Play Area and the Unit counts as destroyed. A friendly unescorted Unit in the Play Area may immediately gain a single Akron Aerial Escort for the remainder of the Encounter or until it is destroyed.</description>
     </rule>
-    <rule id="9399-4fef-83de-1d52" name="AWACS�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="9399-4fef-83de-1d52" name="AWACS (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>Weapons with the Aerial Quality gain the Extreme Range and Homing Quality if the Initial Target is within 20&quot; of an Akron Sentry Rotor Unit.</description>
     </rule>
-    <rule id="1c16-52d6-ad37-928c" name="Reliable Design (NO)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
-      <description>This Unit re-rolls blanks when making Jury-Rigged Repairs</description>
-    </rule>
-    <rule id="b44f-ea85-bc94-f729" name="Long Range Support�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="b44f-ea85-bc94-f729" name="Long Range Support (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>Akron Aerial Escorts within 15” of this Model provide +2 to Attack Action Dice Pools at Point Blank Range rather than the usual +1. Talon Autogyro Tokens may re-roll blank results in any Assault that they participate in within 15” of this Unit.</description>
     </rule>
-    <rule id="aa42-18e0-bcd6-4b04" name="Hammer Song�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="aa42-18e0-bcd6-4b04" name="Hammer Song (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>Once per Activation, this Unit may make the following as a Valour Effect provided the Valour card discarded has a value of at least 40 (including by Valorous Conduct). Each Model in the Unit with this rule, that has caused at least one point of damage in a Ramming Action with their Twin Sturginium Hammers or Grant Jackhammer this Activation, may make a second Ramming Action against the same or a new Point of Impact within 2” of the first. The Action Dice Pool for the second Ram is the same as the first. The Moving Model may not make any further movement this Activation if it uses this rule.</description>
     </rule>
-    <rule id="bb2a-ac29-b05f-d3d1" name="RJ Afterburner�" publicationId="e6a1-85d3-8979-7880" hidden="false">
-      <description>During its Activation, this Model may increase its Speed by 9&quot; and is Obscured for the remainder of the Round. If it does so it receives a Disorder Condition and may not use Hammer Song, Turn, Shoot or Assault during the same Activation.</description>
+    <rule id="bb2a-ac29-b05f-d3d1" name="RJ Afterburner (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
+      <description>During its Activation, this Model may increase its Speed by 9&quot; and is Obscured for the remainder of the Round. If it does so it receives a Disorder Condition and may not use Hammer Song, Turn, Shoot or Assault during the same Activation.�</description>
     </rule>
-    <rule id="ac11-db49-c94e-22bd" name="Helical Rail Guns�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="ac11-db49-c94e-22bd" name="Helical Rail Guns (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>Weapons on this Unit with the Gunnery Quality have a Support value of 3. Attacks with the Gunnery Quality by this Unit treat the Citadel of their Initial Target as one lower than indicated. When making an Attack against Models with the Skimming Unit or Aerial Unit Positional Traits, each weapon with the Gunnery Quality receives +1 Action Dice. When making an Action against Models with the Submerged Unit Positional Trait, each weapon with the Gunnery Quality receives -1 Action Dice.</description>
     </rule>
-    <rule id="d598-ef5b-6064-c21d" name="Thermobaric Volley�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="d598-ef5b-6064-c21d" name="Thermobaric Volley (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>Weapons on this Unit with the Aerial Quality gain the Hazardous Quality. As a Valour Effect after rolling an Attack, if the number of Exploding Hits rolled against the Initial Target exceed its Mass, then all hits and Heavy Hits in the initial roll for the Attack count as Exploding Hits. Action dice generated by the Exploding Hits are unaffected by this rule.</description>
     </rule>
-    <rule id="e204-7522-f18d-3ec0" name="Auto-Destruction Sequence**" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="e204-7522-f18d-3ec0" name="Auto-Destruction Sequence (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>Once per Activation, this Unit may make the following Valour Effect provided the Valour card discarded has a value of at least 40 (including by Valorous Conduct). Any Model in this Unit may be immediately destroyed. For every two Models destroyed in this manner, automatically inflict a Catastrophic Explosion on a Model within 2”.</description>
     </rule>
-    <rule id="f4a4-b36e-8c41-4786" name="High Speed Guidence�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="f4a4-b36e-8c41-4786" name="High Speed Guidence (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>When using the Spotter or AWACS (Akron Warning And Control System) rules, Cruise Missile Silos gain the High Velocity Quality.</description>
     </rule>
-    <rule id="babc-246f-0bd1-bddf" name="Platform Transport**" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="babc-246f-0bd1-bddf" name="Platform Transport (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>During the Reserves Step of any Round where this Model is in the Play Area, it may immediately deploy a platform consisting of a Unit of a single Model with the Colorado Class, Farpoint Class, or Oklahoma Class traits. The platform does not have the Forward Deployment rule and is instead deployed immediately within 2” of this Model. The platform does not cost additional points but does not have any upgrades. Once a platform has been deployed using this rule from this Model, this Model loses the Platform Transport rule for the remainder of the Encounter.</description>
     </rule>
-    <rule id="dba8-d1f1-1219-6048" name="Akron Aerial Escort**" publicationId="e6a1-85d3-8979-7880" hidden="false">
-      <description>The Akron Aerial Escort is an Escort Token. Catastrophic Explosions can only remove an Akron Aerial Escort Token if caused by Attacks with the Aerial Quality. Escorted Units with an Akron Aerial Escort gain the Extreme Range Quality to any Attacks they make with the Aerial Quality.</description>
+    <rule id="dba8-d1f1-1219-6048" name="Akron Aerial Escort (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
+      <description>The Akron Aerial Escort is an Escort Token (see pg 32 of the Dystopian Wars rules). Catastrophic Explosions can only remove an Akron Aerial Escort Token if caused by Attacks with the Aerial Quality. Escorted Units with an Akron Aerial Escort gain the Extreme Range Quality to any Attacks they make with the Aerial Quality.</description>
     </rule>
-    <rule id="7128-f088-fcc6-6b08" name="Breaker of Bows�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="7128-f088-fcc6-6b08" name="Breaker of Bows (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>This Unit may Ram Surface Units. This Unit scores an additional Victory Point each time it scores Victory Points for destroying a Surface Unit with an Assault or Ramming Action.</description>
     </rule>
-    <rule id="e3bb-c3f1-db9c-719c" name="Experimental Shield Amplifier�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="e3bb-c3f1-db9c-719c" name="Experimental Shield Amplifier (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>Any Friendly Surface Units within 7” of Models with this rule counts as having a Mass of +1 for calculating the effectiveness of their Shield Generators. The amplifier enables the Unit’s Shield Generator to be limited to a maximum of 4 dice rather than the usual 3.</description>
     </rule>
-    <rule id="5418-a0b3-a205-775d" name="Void Engine Magazine�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="5418-a0b3-a205-775d" name="Void Engine Magazine (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>If this Unit is Crippled or while it has a Generator Shutdown Critical Damage Marker, its Apokalyps Cannon loses the Extreme Range quality and instead gains the Limited Quality.</description>
     </rule>
-    <rule id="4073-0c13-d827-7ab1" name="Silent Hunter�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
-      <description>Units with this rule may be deployed at the start of an Encounter as a Silent Hunter. Units that do so are deployed at the same time as Vanguard moves and may be deployed anywhere at least 20” from the enemy deployment zone. Units deploying with Silent Hunter gain the Homing Quality to any Attacks with the Torpedo Quality until the end of that Round.�</description>
+    <rule id="4073-0c13-d827-7ab1" name="Silent Hunter (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+      <description>Units with this rule may be deployed at the start of an Encounter as a Silent Hunter. Units that do so are deployed at the same time as Vanguard moves and may be deployed anywhere at least 20” from the enemy deployment zone. Units deploying with Silent Hunter gain the Homing Quality to any Attacks with the Torpedo Quality until the end of that Round.</description>
     </rule>
-    <rule id="eed3-161a-7abb-124e" name="Ekranoplan�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="eed3-161a-7abb-124e" name="Ekranoplan (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>This Unit has a Drift of 1”.</description>
     </rule>
-    <rule id="1f23-42e4-6c7a-7d44" name="Piranya Escorts�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
-      <description>Any Piranya Models using the Attached Unit Rule with this Unit may deploy as part of this Unit using Unexpected Arrival too.</description>
+    <rule id="1f23-42e4-6c7a-7d44" name="Piranya Escorts (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+      <description>Any Piranya Models using the Attached Unit Rule with this Unit may deploy as part of this Unit using the Silent Hunter rule too.</description>
     </rule>
-    <rule id="2fd2-fa8e-f3fc-8f8b" name="Caspian Battlefleet Bonus�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="2fd2-fa8e-f3fc-8f8b" name="Caspian Battlefleet Bonus (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
       <description>Units with the Caspian Overthruster rule gain +1 to the number of inches indicated by the rule.</description>
     </rule>
-    <rule id="a0d9-f4d0-a016-2331" name="Khepri SRS Tokens�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="a0d9-f4d0-a016-2331" name="Khepri SRS Tokens (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>These are a type of SRS Token with the following differences. Each Model in this Unit with this rule may place Khepri SRS Tokens in contact with an Initial Target up to 25” away. Each Token contributes 3 Action Dice to their Attack Run and it has the Piercing and Homing Qualities. Resolve the Attack Run by Khepri SRS before any others on the Attack Run Target. If the number of Khepri SRS Tokens in the Attack Run is greater than the Mass of the Attack Run Target, the Action Dice Pool gains the Devastating Quality. Khepri SRS Tokens cannot make Attack Runs on Submerged Units and must try to find New Targets if this situation arises (page 26 of the Rules).</description>
     </rule>
-    <rule id="4fec-a47c-2c2e-b9ea" name="Khepri SRS Capacity�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="4fec-a47c-2c2e-b9ea" name="Khepri SRS Capacity (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>The Battle-Ready Capacity / Crippled Capacity of each Model in this Unit is indicated in parenthesis. Each Model in this Unit may launch the indicated number of Khepri SRS Tokens and place those Tokens in base contact with Enemy Models in any combination Attack Runs. Any remaining Khepri SRS Tokens in the Play Area are removed in the Maintenance Step of the End Phase.</description>
     </rule>
-    <rule id="ef6d-9cb4-5273-88bb" name="Khepri Portal Strike�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="ef6d-9cb4-5273-88bb" name="Khepri Portal Strike (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>When Launching Khepri SRS during the Operations Step, a Unit with this rule with an online Portal Generator may also place an additional Portal Token within 5” of itself. If it does so, any Khepri SRS Tokens launched during that Operations Step by the Unit may be placed within 25” of any Portal Token in the Play Area.</description>
     </rule>
-    <rule id="52c5-a8f6-6309-f95c" name="Cloud Dive�" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+    <rule id="52c5-a8f6-6309-f95c" name="Cloud Dive (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>Aerial Units with this rule may be deployed at the start of an Encounter in a Cloud Dive. Aerial Units that do so are deployed at the same time as Vanguard moves and may be deployed anywhere at least 20” from the enemy deployment zone. Aerial Units performing a Cloud Dive are Obscured until the end of that Round.</description>
     </rule>
-    <rule id="f151-e7cf-bb48-e823" name="Cor Caroli�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="f151-e7cf-bb48-e823" name="Cor Caroli (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Models in this Unit with this rule ignores the effects of the Emergency Condition but counts as having the Disorder Level. Models in the Unit support Assaults with +3 AD to Fray. Models with this rule may support an assault when they are within 3” of the Assaulting model.</description>
     </rule>
-    <rule id="dcc2-5c28-d9d5-d220" name="Ferik Escort Skiff�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="dcc2-5c28-d9d5-d220" name="Ferik Escort Skiff (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>The Ferik Skiff Escort is an Escort Token. They are still removed if an Escorted Unit would suffer a Catastrophic Explosion but doesn’t due to Orichalcite Construction.</description>
     </rule>
-    <rule id="a0e5-69d2-4798-ec1d" name="Ikili Hull�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="a0e5-69d2-4798-ec1d" name="Ikili Hull (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Models in this Unit with this rule have a catamaran design, common in the Sultanate. Models in this Unit with this rule gain +3 Speed during its Movement Step provided that it makes no turns. Furthermore, the duplication of parts across the hulls allows for easier repairs. This Unit may add an additional Action Die to its Repair Test. This is in addition to those given by the Model’s Mass. Furthermore, when making a Jury-Rigged Repair on a Model with this rule, a Hit or Heavy Hit is treated like an Exploding Hit.</description>
     </rule>
-    <rule id="ebed-2a52-5ef9-5148" name="Two per Force�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="ebed-2a52-5ef9-5148" name="Two per Force (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>You may only include up to two of this Unit in a Force.</description>
     </rule>
-    <rule id="797a-6783-86f3-738a" name="Orichalcite Construction�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="797a-6783-86f3-738a" name="Orichalcite Construction (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Battle-Ready Models in this Unit with this rule do not suffer a Catastrophic Explosion if the Attack exceeds the value of their Citadel by double or more. Crippled Models with this rule or Models with this rule suffering multiples of the same Critical Damage results suffer Catastrophic Explosions as normal.</description>
     </rule>
-    <rule id="9c22-14a9-21ca-d77f" name="Skiff Dock�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="9c22-14a9-21ca-d77f" name="Skiff Dock (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Ferik Skiff Escorts in Units within 10” of one or more Models in this Unit with this rule provide +2 to Attack Action Dice Pools at Point Blank Range rather than the usual +1. Furthermore, roll an Action Die each time a Ferik Skiff Escort Token is removed from a Unit within 10” of one or more Models with this rule (including if there are still Tokens present when a Unit with Skiff Escorts is destroyed). On a roll of a Counter or Heavy Counter the Skiff Escort Token is not removed. Instead, it is placed in Base contact with either Models with this rule, the Unit the Escort Token was originally lost from or another Friendly Model within 7” of this Unit.�</description>
     </rule>
-    <rule id="0621-51de-26b8-202f" name="The Sultan’s Hammer�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
-      <description>Provided the Model with this rule declares all its Attacks with the Aerial Quality against a single Initial Target, each weapon on this Model with the Aerial Quality gains the Hypervelocity Quality and receives +1 Action Dice for that Shooting Step.</description>
+    <rule id="0621-51de-26b8-202f" name="The Sultan’s Hammer (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+      <description>Provided the Model with this rule declares all its Attacks with the Aerial Quality against a single Initial Target, each weapon on this Model with the Aerial Quality gains the High Velocity Quality and receives +1 Action Dice for that Shooting Step.</description>
     </rule>
-    <rule id="7459-7c35-54e7-3655" name="The Sultan’s Monitor�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="7459-7c35-54e7-3655" name="The Sultan’s Monitor (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>Each Round, a single friendly Unit (excluding this Unit) within 15&quot; may remove all Disorder Levels from itself at the start of their Activation.</description>
     </rule>
-    <rule id="9702-61f2-9adf-2829" name="Portal Focus�" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+    <rule id="9702-61f2-9adf-2829" name="Portal Focus (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>A Unit with this rule may, as a Special Operations Action, place a 40mm Portal Token within 20” of itself. During the Round, when this Unit has a friendly Portal Token within 4” and makes an Attack with the Bomb or Broadside Qualities or an Assault, this Unit may measure the range of the Attack or Assault as though being made from any other friendly Portal Token. This Unit still requires Line of Sight to the Initial Target, but the weapon must replace their listed Fire Arc with a 360-degree Fire Arc if used with a Portal. Escort Tokens cannot provide a benefit to this Attack. Remove a friendly Portal Token from the Play Area once an Action has been taken. This does not have to be the Portal used for that Action. Any remaining Portal Tokens are removed from the Play Area at the start of the Maintenance Step.</description>
     </rule>
-    <rule id="8d45-38e1-cce2-fbf2" name="Triangulated Solution�" publicationId="e6a1-85d3-8979-7880" hidden="false">
+    <rule id="8d45-38e1-cce2-fbf2" name="Triangulated Solution (3.04)" publicationId="e6a1-85d3-8979-7880" hidden="false">
       <description>A single Attack with the Torpedo Quality by this Unit each Activation receives +5 action dice provided that the Initial Target is within 15” of a Model with the Hydrophone Relay or Infrasound Detector rule.</description>
     </rule>
-    <rule id="4fdd-a708-f940-e052" name="Turbo Encabulation Drive�" publicationId="908d-6feb-2e9e-843b" hidden="false">
+    <rule id="4fdd-a708-f940-e052" name="Turbo Encabulation Drive (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>Instead of the Movement step for a Unit with this rule, the Unit may use their drive make a Turbo Encabulation roll. Add an additional die to the roll for each time a Drive is used by the Force in the same Round (so the second use that Round you would roll two dice, the third would be three and so on). Choose any single result from the dice rolled of the Active Player’s choice, except if a blank is rolled you must always choose that.
 
 Explosive - Perfect Encabulation: The Unit must be replaced at a new point anywhere in the Play Area.
@@ -737,35 +725,173 @@ Turbo Encabulation rolls may not be re-rolled or otherwise manipulated except by
     <rule id="f339-7bee-3b5d-1576" name="Cetacean Capacity*" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>The Battle-Ready Capacity / Crippled Capacity of each Model in this Unit is indicated in parenthesis. Each Model in this Unit may launch the indicated number of Cetacean Constructs and place those Tokens in base contact with Friendly and/or Enemy Models in any combination of Physeter Assaults, Cetacean Escorts or Orca Attack Runs. The type of Tokens and rules depends on the ones available to this Unit. The total number of Cetacean Construct Tokens deployed by this Model in a Round cannot exceed its Cetacean Capacity. Any remaining Cetacean Construct Tokens in the Play Area are removed in the Maintenance Step of the End Phase.</description>
     </rule>
-    <rule id="63fd-1026-6a17-0bc9" name="Aerial Repair Platform*" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>Roll an Action Die each time a Friendly Aerial Unit is destroyed within 7” of this Unit. On a roll of a Counter or Heavy Counter the Aerial Unit is not removed and instead remains in play with a single Hull point.</description>
+    <rule id="63fd-1026-6a17-0bc9" name="Aerial Repair Platform (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+      <description>Roll an Action Die each time a Friendly Model with the Aerial Unit Trait is destroyed within 7” of this Unit. On a roll of a Counter or Heavy Counter the Model is not removed and instead remains in play with a single Hull point.</description>
     </rule>
     <rule id="7d71-fbc4-7652-88bc" name="Aerial Shield Generator*" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>Any Friendly Aerial Units within 10” of Models with this rule counts as having a Mass of +1 for calculating the effectiveness of their Shield Generators. The projector enables the Unit’s Shield Generator to be limited to a maximum of 4 dice rather than the usual 3. If a Friendly Aerial Unit does not have a Shield Generator, then it counts as having one while within 10” of a Model with this rule.</description>
     </rule>
-    <rule id="0d05-767f-09de-5a63" name="Aerial Shield Projector*" publicationId="908d-6feb-2e9e-843b" hidden="false">
+    <rule id="0d05-767f-09de-5a63" name="Aerial Shield Projector (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>Any Friendly Aerial Units within 10” of Models with this rule counts as having a Mass of +1 for calculating the effectiveness of their Shield Generators. The projector enables the Unit’s Shield Generator to be limited to a maximum of 4 dice rather than the usual 3. If a Friendly Aerial Unit does not have a Shield Generator, then it counts as having one while within 10” of a Model with this rule.</description>
     </rule>
-    <rule id="4533-b977-669c-bdcc" name="Cetacean Launch Tubes*" publicationId="908d-6feb-2e9e-843b" hidden="false">
+    <rule id="4533-b977-669c-bdcc" name="Cetacean Launch Tubes (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>Cetacean Constructs launched by Units with this rule may be Placed in base contact with a Friendly or Enemy Unit a further +5” range than normally permitted for the action (Physeter Escort, Physeter Assault or Orca Attack Run). Furthermore, this Unit contributes +1 Physeter Construct Token to any Physeter Ambush at the start of the Encounter.</description>
     </rule>
-    <rule id="16cf-2537-6b52-ba3a" name="Physeter Assault*" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>This is a Special Operations Action that may be made by this Unit. Each Model in this Unit with this rule may place Physeter Construct Tokens in contact with an Initial Target up to 20” away. Each Physeter Construct Token contribute 5 Action Dice to an Assault against that Initial Target. The Physeter Construct stack count as the Assaulting Model, and they ignore Counter Assaults. Friendly SRS placed in contact with Initial Target may support the Physeter Construct Token stack in the Assault. All Physeter Construct Tokens in the stack are discarded at the end of that Assault. This Unit may not make an Assault in the same Round that it makes this Special Operation Action.</description>
+    <rule id="16cf-2537-6b52-ba3a" name="Physeter Assault (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>This is a Special Operations Action that may be made by this Unit instead of a normal Assault this Activation. Each Model in this Unit with this rule may place Physeter Tokens in contact with a Submerged or Surface Unit as an Initial Target up to 20” away. These are Assault Tokens. At the beginning of the End Phase, before SRS Resolution, each Each Physeter Assault Token contribute 5 Action Dice to an Assault against that Initial Target. All Physeter Assault Tokens in base contact form a single stack and count as the Assaulting Model, and they ignore Counter Assaults. Friendly SRS placed in contact with Initial Target may support the Physeter Token stack in the Assault. All Physeter Tokens in the stack are discarded at the end of that Assault.</description>
     </rule>
     <rule id="2a14-3136-76e8-7276" name="Physeter Construct Tokens*" publicationId="908d-6feb-2e9e-843b" hidden="false">
       <description>This Unit can launch Physeter Construct Tokens. Physeter Construct Tokens may be used to in Physeter Assaults and as Cetacean Escorts.</description>
     </rule>
-    <rule id="88a0-dba5-7dde-aa3e" name="Naval Shield Amplifier*" publicationId="908d-6feb-2e9e-843b" hidden="false">
-      <description>ny Friendly Surface Units within 10 ” of Models with this rule counts as having a Mass of +1 for calculating the effectiveness of their Shield Generator s. The amplifier enables the Unit’s Shield Generator to be limited to a maximum of 4 dice rather than the usual 3.</description>
+    <rule id="88a0-dba5-7dde-aa3e" name="Naval Shield Amplifier (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>Any Friendly Surface Units within 10” of Models with this rule counts as having a Mass of +1 for calculating the effectiveness of their Shield Generators. The amplifier enables the Unit’s Shield Generator to be limited to a maximum of 4 dice rather than the usual 3.</description>
     </rule>
-    <rule id="d2f1-7efd-6678-9003" name="Scything Strike�" publicationId="908d-6feb-2e9e-843b" hidden="false">
+    <rule id="d2f1-7efd-6678-9003" name="Scything Strike (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Model gains +3 to any Ramming Attack it makes in its Activation.</description>
     </rule>
-    <rule id="381a-833b-bfd2-e1f5" name="Lone Wolf�" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+    <rule id="381a-833b-bfd2-e1f5" name="Lone Wolf (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
       <description>This Unit cannot form part of an Attached Unit. It may still be accompanied by Escort tokens if this Unit has them available.</description>
     </rule>
-    <rule id="9340-6761-3544-4b29" name="Rotational Mount�" publicationId="dbca-8d57-b848-457e" hidden="false">
+    <rule id="9340-6761-3544-4b29" name="Rotational Mount (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
       <description>As a Special Operations Action, this Unit may declare it will change its heading by up to 90-degrees. Rotate the Model (or part of the Model if it is designed to turn) to bring the ‘Front’ to a new heading up to 90-degrees from its position at the start of the Round. For the remainder of its Activation each Model acts with that new facing for Shooting et</description>
     </rule>
+    <rule id="29f1-d3f5-7db3-08ec" name="Gyroscopic Control (3.04)" publicationId="dbca-8d57-b848-457e" hidden="false">
+      <description>A single Attack by this Unit each Activation, with the Homing Quality, gains the Sustained Quality provided the Initial Target is a Surface Unit or a Ground Unit. If the Initial Target also has the Immobile or Lumbering rule, the Attack gains the Devastating Quality.</description>
+    </rule>
+    <rule id="56b1-09f4-2c87-dc39" name="Swordwing Strike (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+      <description>At the start of the first Round, provided at least one Battlefleet has this rule, the Commonwealth player creates a stack of Szabla Swordwing SRS Tokens in what is called a Swordwing Strike. This stack consists of a Szabla Swordwing SRS Token for each Battlefleet in their Force with this rule. This stack is placed on the ship card of a friendly Flagship of the players choice and may be used in the Operations Step of the First Round when they are stacked in Base Contact with one or more Enemy Models anywhere in the Play Area. Szabla Swordwings are SRS Tokens but contribute 5 Action Dice to Attack Runs. They can be combined with other friendly SRS Tokens in Attack Runs. A Szabla Swordwing SRS Token can be removed for every four successes in Interception, determined by the Intercepting player. Any Attack Run that has the majority of the Tokens as Szabla Swordwings has the Sustained and Bomb Qualities and also gains the Rail Quality if against a Mass 1 Target. If the number of Szabla Swordwing SRS Tokens in the Attack Run is greater than the Mass of the Attack Run Target, the Action Dice Pool gains the Rail Quality regardless of the Mass of the Target. Up to six additional Szabla Swordwing SRS Tokens may be added to this Swordwing Strike stack for +15pts per Token. The stack may be split, but the Tokens may only be used in an Attack Run.</description>
+    </rule>
+    <rule id="d365-8bce-3797-d732" name="Familiar Locale (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+      <description>At the start of the Encounter, after terrain placement but before deployment, the Player may remove and replace a single piece of Terrain. The Terrain selected cannot contain an Objective or be Impassible Terrain and may have a maximum Mass of 5. The Terrain cannot be placed in a deployment zone and must be placed in Open Water at least 3” from any other Terrain. Furthermore, the deployment zone for a Player that has one or more of these Battlefleets may be increased by a total of +1” towards the opposing Player’s deployment zone.</description>
+    </rule>
+    <rule id="3348-f492-40ac-7e07" name="Orichalcite Crafted (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+      <description>Mass 1 Models in this Unit with this rule are not automatically destroyed if their Citadel is exceeded by an Attack. They suffer critical damage instead.</description>
+    </rule>
+    <rule id="904b-b97c-9150-5ada" name="Decentralised Systems (3.04)" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>At the start of each Round this Unit may declare it has changed its heading. Nominate which of the sides of each Model in the Unit is the ‘Front’. You may either rotate the Model to this new facing or simply nominate a specific side of the Model. For the remainder of its Activation each Model acts with that new facing for Drift, Movement, Shooting etc.</description>
+    </rule>
+    <rule id="9816-51d2-6c9c-d6e3" name="Alchemical Conflagration (3.04)" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>Actions by this Model with the Alchemical or Hazardous Quality gain the Devastating Quality.</description>
+    </rule>
+    <rule id="1b1c-3753-9c1c-562b" name="Secondary Strike*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>This Model may use this weapon in a Ramming Action as though it were mounted in the Fore Arc. Alternatively, each time a Model with this rule does not use one of the specified weapons this Activation, it may add +3 to any Ramming Attack the Model makes in that Activation.</description>
+    </rule>
+    <rule id="21eb-6e97-cfe9-30b0" name="Shokushu (3.04)" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>Models with this rule gain +3 to their Action Dice Pool when making an Assault or Ram, or +5 if this Model and the Initial Target has the Colossus rule. Instead of making a normal Ramming Action, Models in this Unit each make this Ramming Action. A single enemy Model (of the same Mass or less as this Model) within 5” of a Model in this Unit may immediately be placed in base contact with this Model in any orientation of the Attacking Player’s choosing. This is treated as a Ramming Action by this Model, and it counts as having travelled 5” for the purposes of calculating bonus Action Dice. This rule can be used against enemy Models with all Positional Traits except it cannot be used against Aerial Units or Ground Units unless this Model is also an Aerial Unit.</description>
+    </rule>
+    <rule id="4bc1-ae95-2417-c55e" name="Rin Exosub (NO)" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>The Rin Exosub Battle-Ready Capacity / Crippled Capacity for each Model in this Unit is indicated in parenthesis. Each Model in this Unit may place the indicated number of Rin Exosub Tokens up to 40&quot; from this Model in base contact with an enemy Model. Rin Exosubs can make Attack Runs like SRS Tokens but have a choice of attack profile representing whether they attack from above or below the target. Declare when you are making the Attack Run what all of the Rin Exosub Tokens are doing. All Rin Exosubs must make the Attack Run in the same way. They may either Attack with 5 Action Dice per Token with the Homing, Devastating and Submerged Qualities or may Attack with 5 Action Dice per Token with the Homing, Piercing and Aerial Qualities. Rin Exosub Tokens cannot be intercepted but their Attacks may be Defended against as normal.</description>
+    </rule>
+    <rule id="6d04-40f6-eafc-bf99" name="Exosub Mine Clearance (3.04)" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>During its Operations Step, while placing its Exosub SRS Tokens, this Model may also place tokens in contact with a Minefield Marker within 20”. At the end of the Special Operations Step discard a Exosub SRS Token and roll an Action Die. On a Hit, Heavy Hit or Exploding Hit, the Minefield Marker is discarded. You may repeat this attempt as many times as there are Exosub SRS Tokens remaining in the stack. If the Minefield Marker is discarded, any remaining Exosub SRS Tokens in the stack may be placed on another Minefield Marker within 10”to continue a Mine Clearance attempt on that Marker. If there are not any Minefield Markers within 10”, the Exosub SRS Tokens remain in place until the End Phase when they may Scramble or Find New Targets.</description>
+    </rule>
+    <rule id="48ce-061e-b6a2-ee9b" name="Tidal Surge (3.04)" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>This is a Special Operations Action that may be made by any Model in the Unit with a Mass of 2 or greater and the Paddlewheel Trait. It cannot be made if it has a Navigation Lock Critical Damage Marker or is making another Action requiring the Paddlewheels Trait. Tidal Surge lasts until the start of the next Special Operations Step. The Model making a Tidal Surge Action moves its Drift value directly backwards and reduces its Speed Attribute to zero for the Activation. Models making a Tidal Surge gain +3ADV and SDV. Submerged Units and Surface Units cannot deploy within 10” of Model’s making a Tidal Surge Action. Furthermore, any Submerged Units with one of more Models within 10”” of a Unit with one or more Models making a Tidal Surge Action immediately suffer a Level of Disorder. This Model may not Turn while making this Action.</description>
+    </rule>
+    <rule id="3be6-2431-4561-e912" name="Shield Generator Tower*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>This Unit is equipped with a Shield Generator. It may not be upgraded or replaced. The tower enables the Unit’s Shield Generator to not be limited to a maximum of 3 dice and instead uses the Unit’s actual Mass value.</description>
+    </rule>
+    <rule id="7b58-8bd9-9f4f-1fc3" name="Harokku Generator Array (3.04)" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>Any Friendly Models with a Mass of 2 or greater, counts as being equipped with the same Generators as this Model while they remain within 7” of this Model. The Array cannot give Models the benefit from duplicate Generators at any time.</description>
+    </rule>
+    <rule id="a9e3-8627-83dc-bc61" name="Lingchi Shadow Jumpers*" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>Models in this Unit may make a Special Operations Action known as Landing. If this Model comes into contact with terrain identified in the Encounter as a Landing Point, it does not suffer damage and may remain stationary, with a Drift of zero for the Round. During the Reserves Step of any Round where this Model is in contact with the Landing Zone, when a friendly Ground Unit becomes available from Reserve, it may be deployed within 2” of this Model rather than using any other deployment options. Once a Ground Unit has been deployed using this Model, then place this Model at least 2” from the Landing Zone in any direction desired. This Model loses the Landing Vessel rule for the remainder of the Encounter.</description>
+    </rule>
+    <rule id="bedf-0499-55fa-2197" name="Exosub Capacity (3.04)" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>The Battle-Ready Capacity / Crippled Capacity for each Model in this Unit is indicated in parenthesis. Each Model in this Unit may place the indicated number of Exosub SRS Tokens up to 40&quot; from this Model in base contact with an enemy Model. Exosubs SRS Tokens are a type of SRS Token and have a choice of attack profile representing whether they attack from above or below the target. Declare when you are making the Attack Run what all of the Exosub SRS Tokens are doing. All Exosub SRS Tokens must make the Attack Run in the same way. They may either Attack with 5 Action Dice per Token with the Homing, Devastating and Submerged Qualities or may Attack with 5 Action Dice per Token with the Homing and Piercing Qualities. Resolve the Attack Run by Exosub SRS before any others on the Attack Run Target. 4 successes are required to successfully Intercept an Exosub SRS Token. Exosub SRS Tokens cannot be targeted by the Flak Barrage rule.</description>
+    </rule>
+    <rule id="ce83-fa57-1470-b52a" name="Cross the Beams (3.04)" publicationId="5a03-1c6f-8fc8-2be1" hidden="false">
+      <description>Once per Activation, before declaring an Initial Target, This Unit may make the following Valour Effect provided the Valour card discarded has a value of at least 40 (including by Valorous Conduct). When making an Attack, Models in the Unit’s may support with the Lead value of a Particle Beamer or Particle Cannon to the Action Dice Pool, rather than the normal support value.</description>
+    </rule>
+    <rule id="1b71-a146-9018-17b4" name="Enlightened Generator Ship (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>Any Friendly Models with a Mass of 2 or greater, counts as being equipped with the same Generators as this Model while they remain within 10” of this Model. This Unit cannot have more than one of any Generator type. It cannot give any other Unit the benefit from any Generator type more than once at any time.</description>
+    </rule>
+    <rule id="99e8-f9c9-edc8-390a" name="Orca SRS Capacity (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>These are a type of SRS Token with the following differences. The Battle-Ready Capacity / Crippled Capacity of each Model in this Unit is indicated in parenthesis. Each Model in this Unit may launch the indicated number of Orca SRS Tokens and place them in base contact with Friendly and/or Enemy Models. Each Orca SRS Token has a launch range of 30” and each Token contributes 4 Action Dice to their Attack Run, which has the Piercing and Submerged Qualities. Resolve the Attack Run by Orca SRS before any others on the Attack Run Target. Instead of ‘Weight of Fire’, if the number of Orca Tokens in the Attack Run is greater than the Mass of the Attack Run Target, the Action Dice Pool gains the Sustained Quality. Orca SRS Tokens cannot make Attack Runs on Aerial or Skimming Units and must try to find New Targets if this situation arises (page 26 of the Rules). Orca SRS Tokens cannot be Intercepted or targeted by the Flak Barrage rule.</description>
+    </rule>
+    <rule id="fd2e-65e2-df5d-93c7" name="Physeter SRS Capacity (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>The Battle-Ready Capacity / Crippled Capacity of each Model in this Unit is indicated in parenthesis. Each Model in this Unit may launch the indicated number of Physeter Tokens and place them in base contact with Friendly and/or Enemy Models. These are a type of Assault Token when used in Physeter Assaults. Alternatively, Physeter Tokens placed in base contact with Models in Friendly Units up to 20” away count as Escort Tokens for the duration of the Round. They may not be placed in base contact with Mass 1 Friendly Models or Models that already have Escorts Tokens. A Friendly Unit may not have more than 4 Physeter Tokens as Escorts. As Escort Tokens, Physeters may only be destroyed if the triggering Attack contains the Submerged Quality. They are removed in the Maintenance Step of each Round.</description>
+    </rule>
+    <rule id="b6b4-375b-8001-88fb" name="Interphased  Navigator (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>At the start of the Maintenance Step of the End Phase, this Unit may become an Interphased Unit. An Interphased Unit is removed from the Play Area, placed into Reserves, and a 50mm Interphase Marker is placed in the position of any one Model in this Unit. In subsequent Rounds, Interphased Units must be the first Units Activated in a Force. When an Interphased Unit is Activated, it is immediately deployed, and must be placed within 20” of any Interphase Marker in the Play Area. You must remove one of your Interphase Markers each time this happens. No Model in this Unit can be deployed touching another Model.</description>
+    </rule>
+    <rule id="bc6e-eb14-8b23-dd1c" name="Aces of Rensburg (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>SRS Tokens launched by Units with this rule are called Aces of Rensburg SRS Tokens. Any Attack Run including one or more Aces of Rensburg SRS Tokens has the Voltaic and Piercing Qualities, provided that the Aces of Rensburg SRS Tokens are the majority of friendly SRS Tokens in the Attack Run.</description>
+    </rule>
+    <rule id="01df-88c6-831a-a096" name="Blitzen SRS Capacity (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>The Battle-Ready Capacity / Crippled Capacity for each Model in this Unit is indicated in parenthesis. Blitzen SRS Tokens are SRS Tokens but contribute 5 Action Dice to Attack Runs. They can be combined with other friendly SRS Tokens in Attack Runs. A Blitzen Bomber SRS Token is removed for every two successes in Interception, but they can only be Intercepted once all other Friendly SRS Tokens have been Intercepted. Any Attack Run that has the majority of the Tokens as Blitzen Bombers has the Sustained, Bomb and Voltaic Qualities. If the number of Blitzen Bomber SRS Tokens in the Attack Run is greater than the Mass of the Attack Run Target, the Action Dice Pool gains the Devastating Quality. Blitzen Bombers cannot make an SRS Recon or SRS Mine Clearance but may use the Combat Air Patrol rule. Blitzen Bombers cannot make Attack Runs on Aerial Units and must try to find New Targets in this situation.</description>
+    </rule>
+    <rule id="bfd9-edb1-6b05-a63f" name="Die Zeitwahl (NO)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>From the second round onwards, instead of rolling the Action Die when using the Unexpected Arrival Rule, this Unit may be immediately made available for deployment. While Battle Ready, as a special operations action this Unit may always be placed back into Reserves.</description>
+    </rule>
+    <rule id="d9c2-da22-5b37-8e61" name="Donnersturm (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>Once per Activation, this Unit may make the following Valour Effect. Any Claw Arc Projectors may be used in the Shooting Phase in the Fore Arc to make an Attack against an Initial Target within 20” using the Lightning Strike weapon profile. The Attack ignores Shield Generators, Storm Generators, Guardian Generators and Shroud Generators. The opponent may always attempt to Cancel this Valour Effect and does not require an additional rule to be able to do so.</description>
+    </rule>
+    <rule id="dbc4-f990-ae10-9e3c" name="Fechtbuch (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>Once per Activation, this Unit may make the following Valour Effect. Models with this rule gain +4 to their Assault Dice Pool when making an Assault, or +6 if the Initial Target has the Colossus rule.</description>
+    </rule>
+    <rule id="ed63-d88a-ee61-eadb" name="Freya Array (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>This rule cannot be used if this Model has Generator Offline Critical Damage.Enemy Units cannot be deployed within 10” of this Model. Furthermore, while a Unit contains one or more Models with a Freya Array, it may maintain coherency at 5” rather than the usual 4”.</description>
+    </rule>
+    <rule id="23c8-2871-2074-f6e8" name="Luftlancer Assault*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>This Model may make assaults within 6” rather than the usual 4”. Furthermore, the Assault by this Model gains the Voltaic Quality. This rule does not apply to Supporting Assaults</description>
+    </rule>
+    <rule id="16ae-277a-f9fd-0ff5" name="Modular Configuration (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>During deployment, this Unit may switch the positions of its Bombard and Heavy Volt Gun Batteries for the duration of the Encounter. The Bombard has the Aft Fire Arc, while the Heavy Volt Gun Batteries have F/P/S Fire Arcs.</description>
+    </rule>
+    <rule id="315b-f13f-b624-a5b3" name="Monster of Nassau (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>Any Attack in this Model’s Activation using a Bombard gain +5 to its Action Dice Pool and may re-roll Blank results. This Unit awards +1 Victory Point to your opponent if it destroyed by a Unit with the Union Trait.</description>
+    </rule>
+    <rule id="3de2-727b-d075-6149" name="Pflicht Aerial Escort (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>The Pflicht is a special type of Escort Token (see pg 32 of the Dystopian Wars rules). Catastrophic Explosions can only remove a Pflicht Aerial Escort Token if caused by Attacks with the Aerial Quality.</description>
+    </rule>
+    <rule id="a08b-ca76-4317-3b52" name="Revel in Chaos (NO)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>Crippled Models with this rule still use the Battle Ready value of their weapons and any Assaults made gain the Devastating Quality.</description>
+    </rule>
+    <rule id="578b-41bb-5190-4d7e" name="Richtofen’s Flying Circus (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>For +15pts this Unit may be joined by Freiherr Albrecht von Richtofen’s elite Luftlancer division known as the Flying Circus. The Unit’s Fray is increased by +2 and Assaults led by this Unit have the Devastating and Voltaic Qualities. This Unit cannot Support Assaults.</description>
+    </rule>
+    <rule id="5137-138f-a6a4-b5c7" name="Vail Midget Subs*" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>The Battle-Ready Capacity / Crippled Capacity of each Model in this Unit is indicated in parenthesis. Each Model in this Unit may place the indicated number of Vali Midget Sub Tokens up to 20&quot; from this Model in base contact with an enemy Model. Vali Midget Subs can make Attack Runs like SRS Tokens, but with 5 Action Dice. The Attack Run has the Homing, Piercing and Submerged Qualities. Vali Midget Sub cannot be intercepted. They cannot make Attack Runs on Aerial Units and must try to find New Targets if this situation arises (page 26 of the Rules).</description>
+    </rule>
+    <rule id="4a5b-4d6b-7a1f-4f0f" name="Zornhau (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>Each Model in the Unit may re-roll Blank Results in Attacks against Surface Units or Ground Units with a Mass of 2 or more.</description>
+    </rule>
+    <rule id="2124-7f95-e436-9982" name="Flack Vierling (NO)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>These quad barrelled weapons are designed to strafe airborne targets, though have proven capable of damaging surface vessels as well. The weapon gains the Sustained Quality against Aerial Units and Skimming Units.</description>
+    </rule>
+    <rule id="744a-5e7c-df1f-95b2" name="Advanced Sturmcoils (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>Sturmklaue and Heavy Sturmklaue on this Unit gain the Sustained Quality.</description>
+    </rule>
+    <rule id="9933-02a2-c7e4-255e" name="Haddingjar Projector (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>Any Friendly Models with a Mass of 2 or greater, counts as being equipped with the same Generators as this Model while they remain within 7” of this Model. The Projector cannot give Models the benefit from duplicate Generators at any time.</description>
+    </rule>
+    <rule id="e39f-1547-89f1-8481" name="Lightning Raid (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>At the start of the first Round, provided at least one Battlefleet has this rule, the Imperium player creates a stack of Blitzen SRS Tokens in what is called a Lightning Raid. This stack consists of a Blitzen SRS Token for each Battlefleet in their Force with this rule. This stack is placed on the ship card of a friendly Flagship of the players choice and may be used in the Operations Step of the First Round when they are stacked in Base Contact with one or more Enemy Models anywhere in the Play Area. Blitzen SRS Tokens are SRS Tokens but contribute 5 Action Dice to Attack Runs. They can be combined with other friendly SRS Tokens in Attack Runs. A Blitzen SRS Token is removed for every two successes in Interception, but they can only be Intercepted once all other Friendly SRS Tokens have been Intercepted. Any Attack Run that has the majority of the Tokens as Blitzen SRS Tokens have the Sustained, Bomb and Voltaic Qualities. If the number of Blitzen SRS Tokens in the Attack Run is greater than the Mass of the Attack Run Target, the Action Dice Pool gains the Devastating Quality. Blitzen SRS Tokens cannot make Attack Runs on Aerial Units and must try to find New Targets in this situation (page 26 of the Rules). Up to six additional Blitzen SRS Tokens may be added to this Lightning Raid stack for +10pts per Token. The stack may be split, but the Tokens may only be used in an Attack Run.</description>
+    </rule>
+    <rule id="9fe9-1fd9-d3c8-e3f1" name="Draugr (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>Models in this Unit with this rule ignores the effects of Emergency Disorder but counts as having the Disorder Level. Models with this rule may support an assault when they are within 3” of the Assaulting model. Models with this rule that have one or more Critical Damage Markers cannot remove Levels of Disorder.</description>
+    </rule>
+    <rule id="879e-a9c3-d06e-b405" name="Ride of the Valkyrie " publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>Any Battlefleet including this Unit may include up to two Valkyrie Hunt Rotor Units in addition to any limitations found in the battlefleet. Any Valkyrie Hunt Rotor Units in the Force may take up to three additional Models rather than the usual two additional Models.</description>
+    </rule>
+    <rule id="d279-5cd1-7158-762b" name="Focused Bombardament (3.05)" publicationId="908d-6feb-2e9e-843b" hidden="false">
+      <description>Asingle Attack in this Model’s Activation using a Bombard gain +5 to its Action Dice Pool and may re-roll Blank results.</description>
+    </rule>
+    <rule id="d150-aee0-09de-9393" name="Valkyrie Support" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>When Building a Force, this Unit may be a Partner Unit to a Valkyrie Unit. This means that a Valkyrie Unit in the same Battlefleet as this Unit may become a Joining Unit to this Unit, even though it has the Surface Position Trait. While a Valkyrie Hunt Rotor Unit is Attached to the Skjalden, they gain the Advanced Sturmcoils rule.</description>
+    </rule>
+    <rule id="4328-ea2b-77b3-97c0" name="Hoved Targetinng  Array (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>This rule cannot be used if this Model has Generator Offline Critical Damage. Weapons with the Aerial Quality in the Force, gain the Extreme Range and Homing Quality if the Initial Target is within 20&quot; of a friendly Heimdall Recon Raider Unit. Enemy Units cannot be deployed within 10” of this Model.</description>
+    </rule>
+    <rule id="2b24-33b0-4be6-e24b" name="Huginn and Muninn (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>The Citadel of Initial Targets that are also in Line of Sight of one or more Valkyrie Hunt Rotor Units receives a -2 against Attacks from Models with this rule.</description>
+    </rule>
+    <rule id="725d-8d7a-4a96-973f" name="Kanzler Great Maul (3.04)" publicationId="33cf-b4a6-bff0-0d70" hidden="false">
+      <description>While making Ramming Attacks with a Colossal Melee Weapon, this Unit gains the Devastating Quality. Once per Activation, this Unit may make the following Valour Effect. Models in this Unit with this rule gain +2 to their Assault Dice Pool when making an Assault, or +4 if the Initial Target has the Surface Unit or Ground Unit Trait.</description>
+    </rule>
+    <rule id="a04c-fb04-159e-ff33" name="Assigned Skiff Escort (3.04)" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+      <description>This Unit has two Ferik Skiff Escorts.</description>
+    </rule>
   </sharedRules>
 </catalogue>
\ No newline at end of file
diff --git a/Sultanate.cat b/Sultanate.cat
index f57240b..059d777 100644
--- a/Sultanate.cat
+++ b/Sultanate.cat
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="7b3f-8541-c5c8-b666" name="Sultanate v3.04" revision="9" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com " library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
-  <comment>ORBAT 3.04 (published 17/08/2023)</comment>
+<catalogue id="7b3f-8541-c5c8-b666" name="Sultanate v3.04" revision="10" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com " library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+  <comment>ORBAT 3.04 (published 01/09/2023)</comment>
   <readme>Review 0.03.a0: First version published
 Review 1.01.a0: Second release
 Review 1.02.b0: Third release
@@ -9,7 +9,8 @@ Review 3.02.a1: 5th release minor correction
 Review 3.03.00: 5th release ORBAT update to 3.03
 Review 3.03.01: 5th release ORBAT update to 3.03 (date 2023-02-06)
 Review 3.03.03: correction suggested in discord 3.03 (date 2023-02-06)
-Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
+Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)
+Review 3.04.01: update to ORBAT 3.04 last release (date 2023-09-01)</readme>
   <categoryEntries>
     <categoryEntry id="24d7-a2ac-a5bb-a77d" name="Temir Class" publicationId="d854-a2d6-3d52-44c4" hidden="false"/>
     <categoryEntry id="9c13-9a46-5ee3-4981" name="Sultanate" publicationId="d854-a2d6-3d52-44c4" hidden="false"/>
@@ -266,11 +267,6 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="ab44-e3d5-3373-80f8" type="max"/>
           </constraints>
         </categoryLink>
-        <categoryLink id="3482-2b29-0606-66b3" name="Patron" hidden="false" targetId="d6e0-2055-9c1b-5e86" primary="false">
-          <constraints>
-            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d9f9-eb51-f0b5-3102" type="min"/>
-          </constraints>
-        </categoryLink>
       </categoryLinks>
     </forceEntry>
     <forceEntry id="5e20-ec14-f2fa-50e1" name="Turkish Frontline Battlefleet" hidden="false">
@@ -645,7 +641,11 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
     </forceEntry>
     <forceEntry id="e7b4-36aa-bd2e-35e0" name="Order Frontline Battlefleet" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <infoLinks>
-        <infoLink id="1fe5-9045-9dbb-f845" name="Strategic Reserve*" hidden="false" targetId="3f21-1511-2bff-8d3b" type="rule"/>
+        <infoLink id="1fe5-9045-9dbb-f845" name="Strategic Reserve (3.04)" hidden="false" targetId="3f21-1511-2bff-8d3b" type="rule">
+          <modifiers>
+            <modifier type="set" field="hidden" value="false"/>
+          </modifiers>
+        </infoLink>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="e68e-0aae-7e5c-2eb5" name="Flagship" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="fef3-1842-580c-4bef" primary="false">
@@ -712,7 +712,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
     </forceEntry>
   </forceEntries>
   <selectionEntries>
-    <selectionEntry id="a9b1-4521-78af-c87a" name="Anatolia Heavy Battlecruiser" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="a9b1-4521-78af-c87a" name="Anatolia Heavy Battlecruiser" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -867,7 +867,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="9242-3ccc-223d-a631" name="Hurrem Grand Cruiser" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="9242-3ccc-223d-a631" name="Hurrem Grand Cruiser" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -1869,7 +1869,8 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
               <selectionEntryGroups>
                 <selectionEntryGroup id="09d8-efbf-b6e8-e7c9" name="Escort" hidden="false" collective="false" import="true">
                   <constraints>
-                    <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b4f1-615b-a12b-775f" type="max"/>
+                    <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b4f1-615b-a12b-775f" type="min"/>
+                    <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c84a-18b5-0524-d125" type="max"/>
                   </constraints>
                   <entryLinks>
                     <entryLink id="f6a1-490c-efef-7494" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
@@ -2628,7 +2629,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="01b5-e15f-2568-da31" name="Abydos Hover Stronghold" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="01b5-e15f-2568-da31" name="Abydos Hover Stronghold" hidden="false" collective="false" import="true" type="model">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -2654,7 +2655,20 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="51d2-b8a7-7c9a-864e" type="max"/>
           </constraints>
           <entryLinks>
-            <entryLink id="a128-a93f-d835-d0ae" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
+            <entryLink id="a436-007e-9a97-ec42" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry">
+              <constraints>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e860-1e40-22f9-8366" type="max"/>
+              </constraints>
+            </entryLink>
+            <entryLink id="15c0-59ee-9b99-3133" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry">
+              <modifiers>
+                <modifier type="set" field="7c9b-6b09-b5ac-2249" value="0.0"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c1a5-9315-faef-1b45" type="min"/>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f45f-25a3-a8e0-d27c" type="max"/>
+              </constraints>
+            </entryLink>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
@@ -2788,7 +2802,8 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
               <selectionEntryGroups>
                 <selectionEntryGroup id="3ec3-50b5-4c16-2048" name="Escort" hidden="false" collective="false" import="true">
                   <constraints>
-                    <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4ff1-5fb2-18da-046d" type="max"/>
+                    <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4ff1-5fb2-18da-046d" type="min"/>
+                    <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9d23-bdba-1c19-4227" type="max"/>
                   </constraints>
                   <entryLinks>
                     <entryLink id="0433-c9a9-6c07-6c57" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
@@ -3032,7 +3047,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="94bf-b3ab-22a9-aa91" name="Benghazi Offshore Support Platforms" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="94bf-b3ab-22a9-aa91" name="Benghazi Offshore Support Platforms" hidden="false" collective="false" import="true" type="model">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -3586,7 +3601,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="d8b0-731a-dcf7-4603" name="Khomas" hidden="false" collective="false" import="true" targetId="96e6-17bb-ae04-3710" type="selectionEntry"/>
+        <entryLink id="d8b0-731a-dcf7-4603" name="Khoms" hidden="false" collective="false" import="true" targetId="96e6-17bb-ae04-3710" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
@@ -3614,11 +3629,16 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="d30e-23e3-f32e-9383" name="Escort" hidden="false" collective="false" import="true">
-          <constraints>
-            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3b59-8693-8015-910e" type="max"/>
-          </constraints>
           <entryLinks>
-            <entryLink id="61ff-0d52-d845-cbb6" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
+            <entryLink id="61ff-0d52-d845-cbb6" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry">
+              <modifiers>
+                <modifier type="set" field="7c9b-6b09-b5ac-2249" value="0.0"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="665e-a346-34da-4aad" type="min"/>
+                <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="55d9-97f7-efbc-712e" type="max"/>
+              </constraints>
+            </entryLink>
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
@@ -3630,7 +3650,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="d72f-4d4b-e248-102b" name="Kopesh Destroyer Skimmer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="d72f-4d4b-e248-102b" name="Kopesh Fast Skimmer Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -4114,7 +4134,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="1181-fa00-9fd8-fa74" name="Dogan" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="1181-fa00-9fd8-fa74" name="Dogan" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -4334,7 +4354,8 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
               <selectionEntryGroups>
                 <selectionEntryGroup id="e314-9704-6890-aff0" name="Escort" hidden="false" collective="false" import="true">
                   <constraints>
-                    <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e2c0-5839-598f-f225" type="max"/>
+                    <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="22dc-ff6d-1238-daaf" type="min"/>
+                    <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b9b9-fe24-af1d-6754" type="max"/>
                   </constraints>
                   <entryLinks>
                     <entryLink id="6081-df91-2938-fe88" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
@@ -4446,7 +4467,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       <selectionEntryGroups>
         <selectionEntryGroup id="e339-7977-e4a2-e01b" name="Escort" hidden="false" collective="false" import="true">
           <constraints>
-            <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="470f-94dd-885e-7bd0" type="max"/>
+            <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="470f-94dd-885e-7bd0" type="max"/>
           </constraints>
           <entryLinks>
             <entryLink id="d387-7a16-4fb3-d5c8" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry">
@@ -4456,123 +4477,6 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             </entryLink>
           </entryLinks>
         </selectionEntryGroup>
-        <selectionEntryGroup id="6313-3a25-c6f0-2b34" name="Attached Unit" hidden="false" collective="false" import="true">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a95f-b40c-0c77-a78e" type="max"/>
-          </constraints>
-          <selectionEntries>
-            <selectionEntry id="8bb7-d302-7232-59fe" name="Aydin Supply Ship" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
-              <categoryLinks>
-                <categoryLink id="5bc7-3e00-e32b-2573" name="Aydin Class" hidden="false" targetId="c74b-75fb-442b-f44a" primary="false"/>
-                <categoryLink id="524f-81d2-2a3b-c55d" name="New CategoryLink" hidden="false" targetId="d216-bc05-71f1-0fb4" primary="true"/>
-              </categoryLinks>
-              <selectionEntryGroups>
-                <selectionEntryGroup id="e5c5-f25c-dc26-4407" name="Escort" hidden="false" collective="false" import="true">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d27b-e772-d9a0-916c" type="max"/>
-                  </constraints>
-                  <entryLinks>
-                    <entryLink id="f464-d2c5-6da5-aad6" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
-                  </entryLinks>
-                </selectionEntryGroup>
-              </selectionEntryGroups>
-              <entryLinks>
-                <entryLink id="d6e8-9026-3f74-b44b" name="Aydin" hidden="false" collective="false" import="true" targetId="eec4-fb90-1ff0-1e4c" type="selectionEntry"/>
-              </entryLinks>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
-                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-              </costs>
-            </selectionEntry>
-            <selectionEntry id="cce4-11a3-ca5d-fbcf" name="Konya Mainteinance Ship" hidden="false" collective="false" import="true" type="unit">
-              <categoryLinks>
-                <categoryLink id="67f8-16ac-083a-8f51" name="New CategoryLink" hidden="false" targetId="d216-bc05-71f1-0fb4" primary="true"/>
-                <categoryLink id="d4d2-be1a-f294-3fbd" name="Konya Class" hidden="false" targetId="fdcf-47b3-d123-b33a" primary="false"/>
-              </categoryLinks>
-              <selectionEntryGroups>
-                <selectionEntryGroup id="70bc-4f8e-71fc-39b3" name="Escort" hidden="false" collective="false" import="true">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7558-be9b-075c-d5a3" type="max"/>
-                  </constraints>
-                  <entryLinks>
-                    <entryLink id="d886-eac6-b897-a944" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry"/>
-                  </entryLinks>
-                </selectionEntryGroup>
-              </selectionEntryGroups>
-              <entryLinks>
-                <entryLink id="1a17-0fcd-9c1f-f23f" name="Konya" hidden="false" collective="false" import="true" targetId="214f-c8dd-b137-8c10" type="selectionEntry"/>
-              </entryLinks>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
-                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-              </costs>
-            </selectionEntry>
-            <selectionEntry id="3599-e30e-578b-1141" name="Temir Frigate Squadron" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
-              <categoryLinks>
-                <categoryLink id="f634-7ad3-56f5-5c45" name="Temir Class�" hidden="false" targetId="24d7-a2ac-a5bb-a77d" primary="false"/>
-                <categoryLink id="8bb0-e383-c6dd-224b" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
-                <categoryLink id="2c82-9b19-0c72-5915" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
-              </categoryLinks>
-              <selectionEntryGroups>
-                <selectionEntryGroup id="5f69-855f-b8e9-51fe" name="Escort" hidden="false" collective="false" import="true">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f1db-192d-a7d9-ad03" type="max"/>
-                  </constraints>
-                  <entryLinks>
-                    <entryLink id="c5cd-e8fd-072e-f3d4" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry">
-                      <categoryLinks>
-                        <categoryLink id="4318-7556-9cf0-2962" name="Corvette Class" hidden="false" targetId="dfce-ed39-89c4-47a9" primary="false"/>
-                      </categoryLinks>
-                    </entryLink>
-                  </entryLinks>
-                </selectionEntryGroup>
-              </selectionEntryGroups>
-              <entryLinks>
-                <entryLink id="fd7f-b66a-6c60-b82c" name="Temir" hidden="false" collective="false" import="true" targetId="e3df-1720-fdc8-abb4" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="set" field="9e5f-2523-214e-7b18" value="2.0"/>
-                  </modifiers>
-                </entryLink>
-              </entryLinks>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
-                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-              </costs>
-            </selectionEntry>
-            <selectionEntry id="d242-99f1-54e4-81fd" name="Pasha Light Cruiser" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
-              <categoryLinks>
-                <categoryLink id="8d47-0329-e265-19b2" name="Pasha Class" hidden="false" targetId="a9a0-9753-e5bc-1ad5" primary="false"/>
-                <categoryLink id="e0e4-b2b5-03e4-0aa9" name="New CategoryLink" hidden="false" targetId="464e-890a-84b2-8ce9" primary="true"/>
-                <categoryLink id="da0e-f40e-faf9-5c91" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
-              </categoryLinks>
-              <selectionEntryGroups>
-                <selectionEntryGroup id="d797-7377-9978-8d14" name="Escort" hidden="false" collective="false" import="true">
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a47c-3328-d216-0601" type="max"/>
-                  </constraints>
-                  <entryLinks>
-                    <entryLink id="8d33-0e0f-09b5-9e00" name="Ferik Skiff" hidden="false" collective="false" import="true" targetId="b35e-ec76-7056-958d" type="selectionEntry">
-                      <categoryLinks>
-                        <categoryLink id="e4c0-7b44-4978-1e41" name="Corvette Class" hidden="false" targetId="dfce-ed39-89c4-47a9" primary="false"/>
-                      </categoryLinks>
-                    </entryLink>
-                  </entryLinks>
-                </selectionEntryGroup>
-              </selectionEntryGroups>
-              <entryLinks>
-                <entryLink id="5a47-9462-01cc-b895" name="Pasha" hidden="false" collective="false" import="true" targetId="d405-4ee8-bca7-6cfd" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="set" field="0a80-ccb9-35be-c9a2" value="1.0"/>
-                  </modifiers>
-                </entryLink>
-              </entryLinks>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
-                <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
-              </costs>
-            </selectionEntry>
-          </selectionEntries>
-        </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
         <entryLink id="094b-8b73-14c4-2204" name="Spartan" hidden="false" collective="false" import="true" targetId="dc3b-cc4e-a8b6-84a1" type="selectionEntry"/>
@@ -4608,7 +4512,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <entryLink id="9aac-f329-8e79-8de9" name="Lesath" hidden="false" collective="false" import="true" targetId="30a9-7f3e-785b-4904" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -4664,9 +4568,9 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="f570-8d39-8d98-7837" name="Princess Scheherazade, the Cimson Daeva" publicationId="129d-da97-caec-1ddd" hidden="false" collective="false" import="true" type="upgrade">
+    <selectionEntry id="f570-8d39-8d98-7837" name="Faizel Osman, the Sultan&apos;s Sircan" publicationId="129d-da97-caec-1ddd" hidden="false" collective="false" import="true" type="upgrade">
       <rules>
-        <rule id="91d7-65e7-94d1-0d50" name="Faizel Osman - the Sultan&apos;s Sircan" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+        <rule id="91d7-65e7-94d1-0d50" name="Faizel Osman, the Sultan&apos;s Sircan" publicationId="d854-a2d6-3d52-44c4" hidden="false">
           <description>All Sultanate Models in your Force gain +1 to Fray. If the Model has the Order Trait it gains +2 to Fray instead.</description>
         </rule>
       </rules>
@@ -4678,7 +4582,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="a296-5689-b7d7-9a9e" name="Lyceum Aerial Dreadnought" hidden="false" collective="false" import="true" type="upgrade">
+    <selectionEntry id="a296-5689-b7d7-9a9e" name="Lyceum Aerial Dreadnought" hidden="false" collective="false" import="true" type="model">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -4692,9 +4596,16 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             </conditionGroup>
           </conditionGroups>
         </modifier>
+        <modifier type="add" field="category" value="8f91-9e5a-36f5-036a">
+          <conditions>
+            <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="instanceOf"/>
+          </conditions>
+        </modifier>
       </modifiers>
       <categoryLinks>
         <categoryLink id="e15f-2ec3-7da1-3a64" name="New CategoryLink" hidden="false" targetId="fef3-1842-580c-4bef" primary="true"/>
+        <categoryLink id="62f1-75bf-19e5-93d6" name="Lyceum-class" hidden="false" targetId="4dfb-46bb-0bce-b1f6" primary="false"/>
+        <categoryLink id="5333-038c-3d8e-0795" name="Turkish" hidden="false" targetId="03eb-089a-0c01-5751" primary="false"/>
       </categoryLinks>
       <entryLinks>
         <entryLink id="e35e-6a3d-85c0-c336" name="Lyceum" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" targetId="c2f8-9b38-35a1-a006" type="selectionEntry"/>
@@ -4742,7 +4653,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="fe65-276c-674e-e789" name="Badroulbadour" hidden="false" collective="false" import="true" type="upgrade">
+    <selectionEntry id="fe65-276c-674e-e789" name="Badroulbadour" hidden="false" collective="false" import="true" type="model">
       <modifiers>
         <modifier type="set" field="hidden" value="true">
           <conditionGroups>
@@ -4834,6 +4745,21 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="f6af-7cb8-49d4-15e9" name="Ketos Myriapoda Colossus Squadron" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="unit">
+      <modifiers>
+        <modifier type="set" field="hidden" value="true">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
+      </modifiers>
       <categoryLinks>
         <categoryLink id="144b-5101-4f53-ab99" name="Automata" hidden="false" targetId="f143-0c0d-137b-1745" primary="false"/>
         <categoryLink id="1eba-4f2b-6787-242a" name="Submerged Unit" hidden="false" targetId="df3f-7b38-7940-f11e" primary="true"/>
@@ -4848,6 +4774,21 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="54d8-9d67-a2a3-c501" name="Lotan Myriapoda Colossus Squadron" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="unit">
+      <modifiers>
+        <modifier type="set" field="hidden" value="true">
+          <conditionGroups>
+            <conditionGroup type="or">
+              <conditions>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="7b7d-3a94-5f90-9f85" type="instanceOf"/>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="1d1b-a7dc-5580-855f" type="instanceOf"/>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5e20-ec14-f2fa-50e1" type="instanceOf"/>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f921-74af-de51-5d2a" type="instanceOf"/>
+                <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="e7b4-36aa-bd2e-35e0" type="instanceOf"/>
+              </conditions>
+            </conditionGroup>
+          </conditionGroups>
+        </modifier>
+      </modifiers>
       <categoryLinks>
         <categoryLink id="e7eb-c968-8ce2-5eb1" name="Automata" hidden="false" targetId="f143-0c0d-137b-1745" primary="false"/>
         <categoryLink id="d28e-41e9-1bfb-b1b1" name="New CategoryLink" hidden="false" targetId="df3f-7b38-7940-f11e" primary="true"/>
@@ -4858,6 +4799,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </entryLinks>
       <costs>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
       </costs>
     </selectionEntry>
   </selectionEntries>
@@ -4866,20 +4808,20 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f9f5-8764-5e46-3144" type="min"/>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fee7-5208-4a8f-977f" type="max"/>
-        <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9130-291d-f1bf-34f2" type="max"/>
+        <constraint field="selections" scope="force" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9130-291d-f1bf-34f2" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="3942-fbd4-234e-c724" name="Mehmed" hidden="false" targetId="38d6-d6b1-cece-3829" type="profile"/>
-        <infoLink id="395c-6a32-a6dd-8b9e" name="Elite Crew**" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
-        <infoLink id="6614-f2c4-9c15-fed5" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="caa0-9bbf-bec1-a185" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="ac45-39d6-99f2-404d" name="The Sultan’s Monitor**" hidden="false" targetId="7459-7c35-54e7-3655" type="rule"/>
-        <infoLink id="64a0-0937-429c-23e0" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="0f95-0b03-895e-5d8f" name="One Per Battlefleet*" hidden="false" targetId="ebed-2a52-5ef9-5148" type="rule"/>
-        <infoLink id="faee-7293-a184-5dca" name="Ikili Hull**" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
-        <infoLink id="36ad-dde8-cba7-8506" name="Maritime Patrol**" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
-        <infoLink id="70fc-affc-a207-9ed4" name="Fortunes of War**" hidden="false" targetId="949d-d37f-c7c8-1093" type="rule"/>
-        <infoLink id="f2cc-b993-2b51-0ea7" name="Vulnerable Stern*" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="395c-6a32-a6dd-8b9e" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
+        <infoLink id="6614-f2c4-9c15-fed5" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="caa0-9bbf-bec1-a185" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="ac45-39d6-99f2-404d" name="The Sultan’s Monitor (3.04)" hidden="false" targetId="7459-7c35-54e7-3655" type="rule"/>
+        <infoLink id="64a0-0937-429c-23e0" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="0f95-0b03-895e-5d8f" name="Two per Force (3.04)" hidden="false" targetId="ebed-2a52-5ef9-5148" type="rule"/>
+        <infoLink id="faee-7293-a184-5dca" name="Ikili Hull (3.04)" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
+        <infoLink id="36ad-dde8-cba7-8506" name="Maritime Patrol (3.04)" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
+        <infoLink id="70fc-affc-a207-9ed4" name="Fortunes of War (3.04)" hidden="false" targetId="949d-d37f-c7c8-1093" type="rule"/>
+        <infoLink id="f2cc-b993-2b51-0ea7" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="7d2f-c2a3-eb02-8398" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -5075,10 +5017,6 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dcb0-7626-32d6-9b19" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="794a-90b8-b667-e57f" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="3996-dddb-f668-795d" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
@@ -5090,12 +5028,6 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="5e0d-c2f2-e95a-24db" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1f60-626c-cdee-4d6b" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6274-b709-96df-e080" type="max"/>
-          </constraints>
-        </entryLink>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="230.0"/>
@@ -5109,12 +5041,12 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="bea8-4118-b6d8-4839" name="Hurrem" hidden="false" targetId="42ca-5f46-3494-d6bc" type="profile"/>
-        <infoLink id="3cbb-c4ec-1162-dfd6" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="fd74-7b6c-5137-170d" name="Ikili Hull**" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
-        <infoLink id="4ca9-733c-0d1e-b818" name="Maritime Patrol**" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
-        <infoLink id="cd02-9cbf-ab60-4ae3" name="Heavy Firepower�" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="7df4-d1bd-6b9a-be37" name="Command Codes�" hidden="false" targetId="422e-0279-5ff5-c279" type="rule"/>
-        <infoLink id="5172-b93c-908b-2952" name="Reliable Design**" hidden="false" targetId="6f17-ddcb-35bc-4e97" type="rule"/>
+        <infoLink id="3cbb-c4ec-1162-dfd6" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="fd74-7b6c-5137-170d" name="Ikili Hull (3.04)" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
+        <infoLink id="4ca9-733c-0d1e-b818" name="Maritime Patrol (3.04)" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
+        <infoLink id="cd02-9cbf-ab60-4ae3" name="Heavy Firepower (3.04)" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="7df4-d1bd-6b9a-be37" name="Command Codes (3.04)" hidden="false" targetId="422e-0279-5ff5-c279" type="rule"/>
+        <infoLink id="5172-b93c-908b-2952" name="Reliable Design (3.04)" hidden="false" targetId="6f17-ddcb-35bc-4e97" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="22ec-74dd-f152-5ac0" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -5425,35 +5357,18 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="62a1-bd50-05b7-2dcd" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e3f9-1d6e-43d2-cfdd" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="208d-2298-d668-9cc1" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2034-531d-f714-b210" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4034-f31a-24b6-c9ce" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="6b1e-a35b-e621-b260" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="84e5-ceda-51ab-6c7c" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7015-8c5e-d9da-c754" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="b979-5029-af6d-cc07" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="33a0-e03d-f0ed-6a15" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4232-8ef0-6a07-7eba" type="max"/>
-          </constraints>
         </entryLink>
+        <entryLink id="b979-5029-af6d-cc07" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="280.0"/>
@@ -5467,12 +5382,12 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="3f13-7953-7ea4-5a91" name="Carolus" hidden="false" targetId="5f27-d832-5cb3-e31e" type="profile"/>
-        <infoLink id="1716-c06b-4fdb-daab" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="4fe5-3943-e5e4-df6b" name="Cor Caroli**" hidden="false" targetId="f151-e7cf-bb48-e823" type="rule"/>
-        <infoLink id="ceae-1330-688b-0668" name="Elite Crew**" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
-        <infoLink id="a325-2da1-11d1-4d50" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="a7a6-488c-e1d9-3e4f" name="Armoured Decking**" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="943a-db80-10db-4f92" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="1716-c06b-4fdb-daab" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="4fe5-3943-e5e4-df6b" name="Cor Caroli (3.04)" hidden="false" targetId="f151-e7cf-bb48-e823" type="rule"/>
+        <infoLink id="ceae-1330-688b-0668" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
+        <infoLink id="a325-2da1-11d1-4d50" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="a7a6-488c-e1d9-3e4f" name="Armoured Decking (3.04)" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
+        <infoLink id="943a-db80-10db-4f92" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="0a57-39c5-364c-6dca" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -5483,10 +5398,6 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3066-77d3-da3f-e793" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6c7e-631f-477c-79f1" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="fae2-26c7-645d-7783" name="Judgement Lance" hidden="false" collective="false" import="true" targetId="d86c-d2c7-7964-5f8b" type="selectionEntry">
           <modifiers>
@@ -5510,13 +5421,14 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="a67d-ab8b-c289-0588" name="Hashashin" hidden="false" targetId="18fb-8f1c-9a38-6871" type="profile"/>
-        <infoLink id="0061-8106-f18d-ba0d" name="Agile" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="9d1e-fd07-2dd5-63ef" name="Armoured Decking" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="5861-9d2d-0549-ba46" name="Mine Sweeper" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
+        <infoLink id="0061-8106-f18d-ba0d" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="9d1e-fd07-2dd5-63ef" name="Armoured Decking (3.04)" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
+        <infoLink id="5861-9d2d-0549-ba46" name="Shadow Hunter (3.04)" hidden="false" targetId="741b-a6ce-dbe7-9409" type="rule"/>
+        <infoLink id="870b-9613-011b-17b9" name="Gun Runner (3.04)" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="15fa-b805-c100-6e69" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
-        <categoryLink id="d0d4-f097-8b2c-4e6b" name="Fast Skimmer" hidden="false" targetId="8383-53fc-d230-487a" primary="false"/>
+        <categoryLink id="50c9-2b8f-5ecf-acea" name="Destroyer" hidden="false" targetId="63a3-004a-8e9f-2eb4" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="0ee7-7720-005f-5f88" name="Main Weapon" hidden="false" collective="false" import="true">
@@ -5603,14 +5515,19 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
+        </entryLink>
+        <entryLink id="72ca-fcfe-b867-3c14" name="Micro Torpedo Salvo" hidden="false" collective="false" import="true" targetId="ca1a-2241-066b-449a" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+          </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b89e-bf68-40d8-44e5" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2793-5417-946c-8e07" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b80d-d085-c156-34ab" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b45f-ffe9-2626-4eff" type="max"/>
           </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="37.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="40.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -5621,12 +5538,12 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="eb47-e396-23c6-85d3" name="Iskandar" hidden="false" targetId="3c2c-e106-5263-9455" type="profile"/>
-        <infoLink id="a7e1-0cce-cfd0-ac99" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="36b0-86fa-f666-9e6a" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="12d8-a836-1538-c7b2" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="b361-2eef-b73c-3030" name="Maritime Patrol**" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
-        <infoLink id="7628-1604-4ac1-2692" name="Gun Runner**" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
-        <infoLink id="197f-7213-f8ad-d447" name="Vulnerable Stern**" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="a7e1-0cce-cfd0-ac99" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="36b0-86fa-f666-9e6a" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="12d8-a836-1538-c7b2" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="b361-2eef-b73c-3030" name="Maritime Patrol (3.04)" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
+        <infoLink id="7628-1604-4ac1-2692" name="Gun Runner (3.04)" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
+        <infoLink id="197f-7213-f8ad-d447" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="00af-9d1c-7c66-408d" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -5809,19 +5726,11 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="12cc-4d2b-32da-4014" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a11e-7481-85da-a9dd" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="2539-00e5-1e7e-5347" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3938-4e21-f8a9-736a" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="eb21-d0d8-3d42-f72e" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -5829,18 +5738,18 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="e3df-1720-fdc8-abb4" name="Temir" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="e3df-1720-fdc8-abb4" name="Temir" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5f25-68f5-f673-37f8" type="min"/>
         <constraint field="selections" scope="parent" value="8.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9e5f-2523-214e-7b18" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="0cf9-0312-53f6-6af0" name="Temir" hidden="false" targetId="d277-7cf6-bd96-289b" type="profile"/>
-        <infoLink id="08e7-2b83-385e-f0e6" name="Accetable Attrition**" hidden="false" targetId="f07b-4636-21d5-ac87" type="rule"/>
-        <infoLink id="ab53-0c05-b5ab-4480" name="Powerslide*" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="8bda-bd38-217f-658c" name="Gun Runner" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
-        <infoLink id="820a-501a-5a0e-ad10" name="Vulnerable Stern*" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
-        <infoLink id="56d5-7110-3e86-6e20" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="08e7-2b83-385e-f0e6" name="Accetable Attrition (3.04)" hidden="false" targetId="f07b-4636-21d5-ac87" type="rule"/>
+        <infoLink id="ab53-0c05-b5ab-4480" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="8bda-bd38-217f-658c" name="Gun Runner (3.04)" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
+        <infoLink id="820a-501a-5a0e-ad10" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="56d5-7110-3e86-6e20" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="a5ac-a919-1dd8-d8bf" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -5915,19 +5824,19 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="c40a-d1df-f0b9-17ef" name="Suleiman" hidden="false" targetId="33bb-215a-9894-7f46" type="profile"/>
-        <infoLink id="5673-2a4a-148b-d5cb" name="Combat Air Patrol**" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
-        <infoLink id="6df6-f61e-243d-1566" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="5c57-560c-a1ae-d5c7" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="fe08-ac85-5c38-97db" name="SRS Mine Clearance**" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
-        <infoLink id="f002-10fb-7972-41d6" name="SRS Recon**" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
-        <infoLink id="ac3e-d0c1-f365-9931" name="Ikili Hull**" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
-        <infoLink id="7c46-5d1a-1e56-84db" name="Heavy Firepower**" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="fb5c-9880-a0e6-839a" name="Flak Barrage**" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
+        <infoLink id="5673-2a4a-148b-d5cb" name="Combat Air Patrol (3.04)" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
+        <infoLink id="6df6-f61e-243d-1566" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="5c57-560c-a1ae-d5c7" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="fe08-ac85-5c38-97db" name="SRS Mine Clearance (3.04)" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
+        <infoLink id="f002-10fb-7972-41d6" name="SRS Recon (3.04)" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
+        <infoLink id="ac3e-d0c1-f365-9931" name="Ikili Hull (3.04)" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
+        <infoLink id="7c46-5d1a-1e56-84db" name="Heavy Firepower (3.04)" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="fb5c-9880-a0e6-839a" name="Flak Barrage (3.04)" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
             <modifier type="append" field="name" value=" (7)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="7b52-ec04-e492-abe3" name="Vulnerable Stern**" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="7b52-ec04-e492-abe3" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="bd3a-2926-13ed-ae0c" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -5957,56 +5866,31 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="32ca-ef45-bddc-7923" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="468e-e06e-41aa-ab8d" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="f7d3-b726-904a-cbb9" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6bad-0416-6028-715e" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="91c8-0594-533a-c9b6" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="1f7b-56c0-2e8a-9aa7" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d56c-0446-7790-ee72" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="269d-434a-49b0-f543" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="20a5-85ea-69a8-4d6d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="853c-7f35-bcb8-bc25" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e2fc-c193-fae2-eeca" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="c0c8-39bb-d629-8ca8" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="94f3-c518-0aa7-d9de" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6981-ffb4-8a78-4c80" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="0b17-6ac2-a3c4-b15d" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8650-aad2-eb68-be1a" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b070-15e6-7fa9-8635" type="max"/>
-          </constraints>
         </entryLink>
+        <entryLink id="0b17-6ac2-a3c4-b15d" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry"/>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="345.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="325.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -6302,19 +6186,11 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="03ab-c50e-3f3d-07f5" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f13a-d373-e2bb-df4b" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="9e3d-eadd-23f9-def6" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5455-7eac-1fde-bea0" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e5fe-9635-371f-5b01" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -6323,12 +6199,9 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="b35e-ec76-7056-958d" name="Ferik Skiff" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
-      <constraints>
-        <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3762-908e-555b-bdb0" type="max"/>
-      </constraints>
       <infoLinks>
-        <infoLink id="6cd3-592d-47c6-0514" name="Corvette" hidden="false" targetId="aec8-fcde-7862-1b9d" type="profile"/>
-        <infoLink id="8c77-7e75-adf2-7522" name="Ferik Escort Skiff" hidden="false" targetId="dcc2-5c28-d9d5-d220" type="rule"/>
+        <infoLink id="6cd3-592d-47c6-0514" name="Escort" hidden="false" targetId="da59-69f4-e562-8990" type="profile"/>
+        <infoLink id="8c77-7e75-adf2-7522" name="Ferik Escort Skiff (3.04)" hidden="false" targetId="dcc2-5c28-d9d5-d220" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="2c37-991f-333b-cdd9" name="Corvette Class" hidden="false" targetId="dfce-ed39-89c4-47a9" primary="false"/>
@@ -6345,13 +6218,13 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="6ea0-09ce-e84f-d407" name="Aydin" hidden="false" targetId="7395-a4be-0812-fe08" type="profile"/>
-        <infoLink id="37b0-1bb5-b071-699a" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="2eb5-f838-c712-7f65" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="0a9d-2a83-757f-2e4c" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="a139-a88c-75e6-50b4" name="Logistical Support**" hidden="false" targetId="408e-7b40-68d7-059f" type="rule"/>
-        <infoLink id="0ce4-76d0-f0bc-97a4" name="Supply Depot**" hidden="false" targetId="23f5-7a90-116f-cba1" type="rule"/>
-        <infoLink id="f47d-b995-cf46-6073" name="Gun Runner**" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
-        <infoLink id="3084-cb86-96b3-baf8" name="Vulnerable Stern**" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="37b0-1bb5-b071-699a" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="2eb5-f838-c712-7f65" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="0a9d-2a83-757f-2e4c" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="a139-a88c-75e6-50b4" name="Logistical Support (3.04)" hidden="false" targetId="408e-7b40-68d7-059f" type="rule"/>
+        <infoLink id="0ce4-76d0-f0bc-97a4" name="Supply Depot (3.04)" hidden="false" targetId="23f5-7a90-116f-cba1" type="rule"/>
+        <infoLink id="f47d-b995-cf46-6073" name="Gun Runner (3.04)" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
+        <infoLink id="3084-cb86-96b3-baf8" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="6aae-5882-2ab6-8872" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -6398,14 +6271,14 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="08a9-d076-a2ba-cf03" name="Constantinople" hidden="false" targetId="ee92-286a-3e57-30af" type="profile"/>
-        <infoLink id="f4cd-6dd9-0d06-4cae" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="4809-5bc3-74fa-57d5" name="Combat Air Patrol**" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
-        <infoLink id="22e5-c119-8d86-fc3e" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="ae70-cc97-c8ce-fe73" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="5d2b-ba5b-72d8-69a8" name="SRS Mine Clearance**" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
-        <infoLink id="5fdb-b989-8a8d-214f" name="SRS Recon**" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
-        <infoLink id="3a0d-19d8-831d-d04a" name="Maritime Patrol**" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
-        <infoLink id="9ba8-4c4d-0f5b-a721" name="Vulnerable Stern**" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="f4cd-6dd9-0d06-4cae" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="4809-5bc3-74fa-57d5" name="Combat Air Patrol (3.04)" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
+        <infoLink id="22e5-c119-8d86-fc3e" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="ae70-cc97-c8ce-fe73" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="5d2b-ba5b-72d8-69a8" name="SRS Mine Clearance (3.04)" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
+        <infoLink id="5fdb-b989-8a8d-214f" name="SRS Recon (3.04)" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
+        <infoLink id="3a0d-19d8-831d-d04a" name="Maritime Patrol (3.04)" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
+        <infoLink id="9ba8-4c4d-0f5b-a721" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="c59d-ebd9-cbeb-3657" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -6435,25 +6308,16 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9326-5ff5-d7ae-2f7a" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e6dd-9607-a910-00b7" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="5850-242b-a258-ef0f" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9043-7963-cb13-115f" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5cb6-11b8-c58a-bdbe" type="max"/>
-          </constraints>
+          <modifiers>
+            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
+          </modifiers>
         </entryLink>
         <entryLink id="2e4c-3c17-1d01-6662" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e3d1-b8b6-e0d0-47a5" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7e8d-2b69-c25c-beb1" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -6468,12 +6332,12 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="0310-197a-2708-b676" name="Izmir" hidden="false" targetId="1652-4ff8-1932-38a5" type="profile"/>
-        <infoLink id="356c-3349-435f-3232" name="Agile*" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="2cf2-08fe-abdc-24b8" name="Orichalcite Construction*" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="8224-31fa-3dc1-6b5e" name="Powerslide*" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="3382-b21b-5a9f-55e4" name="Maritime Patrol*" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
-        <infoLink id="0204-029b-581b-2435" name="Gun Runner*" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
-        <infoLink id="fab7-0463-ba65-d499" name="Vulnerable Stern*" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="356c-3349-435f-3232" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="2cf2-08fe-abdc-24b8" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="8224-31fa-3dc1-6b5e" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="3382-b21b-5a9f-55e4" name="Maritime Patrol (3.04)" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
+        <infoLink id="0204-029b-581b-2435" name="Gun Runner (3.04)" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
+        <infoLink id="fab7-0463-ba65-d499" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="7176-81a4-0c90-756f" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -6612,19 +6476,11 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6c35-edfe-64b4-91fc" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d5cf-ed6b-fa07-9335" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="25da-d688-639d-539e" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0bc4-f528-a07a-5430" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6d14-fe5e-8a94-a99f" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -6632,23 +6488,23 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="d0b1-3cde-8007-8794" name="Mihrimah" publicationId="d854-a2d6-3d52-44c4" page="22" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="d0b1-3cde-8007-8794" name="Mihrimah" publicationId="d854-a2d6-3d52-44c4" page="" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0a6e-0631-419a-0970" type="min"/>
         <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f5d0-105e-d8ee-d7c2" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="be20-755c-d326-967b" name="Mihrimah" hidden="false" targetId="7faa-0e1f-2869-497c" type="profile"/>
-        <infoLink id="c55f-58ea-2848-b10e" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="3055-5a7f-466d-a2a2" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="f152-452c-1afd-6ccc" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="1256-a417-0822-0b31" name="Gun Runner**" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
-        <infoLink id="0af7-acdb-75cd-e313" name="Flak Barrage**" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
+        <infoLink id="c55f-58ea-2848-b10e" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="3055-5a7f-466d-a2a2" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="f152-452c-1afd-6ccc" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="1256-a417-0822-0b31" name="Gun Runner (3.04)" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
+        <infoLink id="0af7-acdb-75cd-e313" name="Flak Barrage (3.04)" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
             <modifier type="append" field="name" value=" (3)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="3836-d79b-7093-3a48" name="Vulnerable Stern**" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="3836-d79b-7093-3a48" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="cc14-c705-6cb5-d567" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -6659,43 +6515,22 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4c79-00c8-9f3f-7ad6" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5cfb-3ff3-68f6-774f" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="b81e-68c8-2d16-898c" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ccd0-e0eb-22bf-cf2c" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b23d-58bb-a0c5-4aaa" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="1de0-a309-ac08-9caf" name="Orichalcite Flechette Launcher" hidden="false" collective="false" import="true" targetId="db84-1c9c-98de-aa16" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c45c-b4a4-26d5-161b" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="399b-3bb4-1429-17c1" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="7241-06a8-bcad-e532" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0664-c747-6909-7078" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3e00-5e55-c4a6-cce1" type="max"/>
-          </constraints>
         </entryLink>
+        <entryLink id="7241-06a8-bcad-e532" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry"/>
         <entryLink id="3021-b368-7f95-9ee0" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4a43-e579-08ae-5d65" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c1a2-98e6-e671-3119" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -6703,19 +6538,19 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="d405-4ee8-bca7-6cfd" name="Pasha" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="d405-4ee8-bca7-6cfd" name="Pasha" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b993-0267-a34c-1bf8" type="min"/>
         <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0a80-ccb9-35be-c9a2" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="fd16-21f7-2d62-a00d" name="Pasha" hidden="false" targetId="d01b-1976-100a-d2c1" type="profile"/>
-        <infoLink id="eddd-321a-e5f5-64c7" name="Vulnerable Stern**" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
-        <infoLink id="eb9c-e131-e28a-419e" name="Orichalcite Construction" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="764a-ef70-9b4d-71b2" name="Powerslide*" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="fd19-440e-3164-957a" name="Vanguard*" hidden="false" targetId="f721-8318-3875-0140" type="rule"/>
-        <infoLink id="41bc-8909-d607-d510" name="Gun Runner*" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
-        <infoLink id="8f54-7689-0b87-e579" name="Agile*" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="eddd-321a-e5f5-64c7" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="eb9c-e131-e28a-419e" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="764a-ef70-9b4d-71b2" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="fd19-440e-3164-957a" name="Vanguard (3.04)" hidden="false" targetId="f721-8318-3875-0140" type="rule"/>
+        <infoLink id="41bc-8909-d607-d510" name="Gun Runner (3.04)" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
+        <infoLink id="8f54-7689-0b87-e579" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="5fb8-f24b-e059-d969" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -6728,56 +6563,6 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e6a7-f792-9c7c-584b" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="6980-fa21-1c4e-bc90" name="Generator" hidden="false" collective="false" import="true">
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8a8a-c720-f27c-a7b7" type="max"/>
-              </constraints>
-              <categoryLinks>
-                <categoryLink id="fe09-459f-fb1a-00f6" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
-              </categoryLinks>
-              <entryLinks>
-                <entryLink id="235d-b04a-19ae-4f26" name="Atomic generator" hidden="false" collective="false" import="true" targetId="eef0-442d-aa6f-b314" type="selectionEntry">
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="1892-66d3-7346-45d7" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry">
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="8366-bb91-ec66-946a" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry">
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="a0e0-6572-1b5a-0cac" name="Mirage generator" hidden="false" collective="false" import="true" targetId="e8d8-3cbf-4858-aa61" type="selectionEntry">
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="c2bd-27a0-e623-d7c5" name="Repulsion field generator" hidden="false" collective="false" import="true" targetId="bf96-7810-7d69-a386" type="selectionEntry">
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="d5dc-a418-406b-1a45" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="d680-1cf1-ff1b-f9c4" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="61f8-f89d-ffe4-9682" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
-                  </costs>
-                </entryLink>
-              </entryLinks>
-            </selectionEntryGroup>
             <selectionEntryGroup id="cb0c-4b19-5138-ade4" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="3739-ac6a-f705-9670">
               <modifiers>
                 <modifier type="set" field="fda1-03bb-b4d3-a103" value="0.0">
@@ -6831,15 +6616,65 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-          </selectionEntryGroups>
-        </selectionEntryGroup>
-        <selectionEntryGroup id="d65b-f9ba-fc0a-f95d" name="Secondary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="7f79-4dd2-704b-0215">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b0c5-0a62-d943-65f7" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d1bb-5702-3017-239a" type="max"/>
-          </constraints>
-          <entryLinks>
-            <entryLink id="098d-fce2-f44d-1fdf" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+            <selectionEntryGroup id="fa83-fe9f-ce50-397f" name="Generator" hidden="false" collective="false" import="true">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="843f-9d7c-861e-5154" type="max"/>
+              </constraints>
+              <categoryLinks>
+                <categoryLink id="5a68-24a1-ab99-94fa" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
+              </categoryLinks>
+              <entryLinks>
+                <entryLink id="2cd9-60dc-9a64-a8ec" name="Atomic generator" hidden="false" collective="false" import="true" targetId="eef0-442d-aa6f-b314" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="c054-6be1-1a19-c184" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="17bd-5b50-03f3-7154" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="9f2c-6789-03f6-cf42" name="Mirage generator" hidden="false" collective="false" import="true" targetId="e8d8-3cbf-4858-aa61" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="4495-39e1-08f4-2c70" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="bffb-d131-ba50-f02d" name="Repulsion field generator" hidden="false" collective="false" import="true" targetId="bf96-7810-7d69-a386" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="c1fd-2878-60d6-7d4c" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="282d-d0fe-1030-05d2" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+          </selectionEntryGroups>
+        </selectionEntryGroup>
+        <selectionEntryGroup id="d65b-f9ba-fc0a-f95d" name="Secondary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="7f79-4dd2-704b-0215">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b0c5-0a62-d943-65f7" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d1bb-5702-3017-239a" type="max"/>
+          </constraints>
+          <entryLinks>
+            <entryLink id="098d-fce2-f44d-1fdf" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
               <modifiers>
                 <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
               </modifiers>
@@ -6865,19 +6700,11 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="dc17-c202-1227-ef53" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="75cc-29d3-3f31-2c3a" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="31d3-f232-da7a-b67a" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="88c7-48e3-b77e-97a0" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8976-4dfb-2a2d-6fd3" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -6885,20 +6712,20 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="2adf-49f2-e750-becd" name="Sadrazam" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="2adf-49f2-e750-becd" name="Sadrazam" publicationId="d854-a2d6-3d52-44c4" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f16b-2100-8bc6-14ef" type="min"/>
         <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2ad3-6cc5-aeee-7197" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="6896-477c-b4ca-1a65" name="Sadrazam" hidden="false" targetId="7916-b213-ee1e-cd3c" type="profile"/>
-        <infoLink id="1e2d-5adf-9b4b-5669" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="0771-82ac-be24-40d8" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="2920-9892-0d14-6afb" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="8d10-7804-ff50-036a" name="Maritime Patrol**" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
-        <infoLink id="1e4f-4d2f-214c-370b" name="Gun Runner**" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
-        <infoLink id="7ccb-27ce-d537-4894" name="Vulnerable Stern**" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
-        <infoLink id="c4c8-22b4-8e70-92fe" name="Focused Gunnery**" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
+        <infoLink id="1e2d-5adf-9b4b-5669" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="0771-82ac-be24-40d8" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="2920-9892-0d14-6afb" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="1e4f-4d2f-214c-370b" name="Gun Runner (3.04)" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
+        <infoLink id="7ccb-27ce-d537-4894" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="674c-ab19-ef2d-fa5f" name="Focused Gunnery (3.04)" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
+        <infoLink id="4807-ac59-eb22-dc41" name="Maritime Patrol (3.04)" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="2fa8-1e8a-a535-3b57" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -7110,19 +6937,11 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="956a-605a-dfdb-cd9a" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a603-da1e-9e09-2bb7" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="b094-2a0e-e575-991a" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a8d9-2c39-5aa0-1c43" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c47c-a803-6f2b-4c46" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -7137,49 +6956,37 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="af61-199f-20dd-618d" name="Retaj" hidden="false" targetId="3a62-ea9f-4ec9-9e40" type="profile"/>
-        <infoLink id="3af7-5c0c-223b-9cfb" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="e888-d9bf-fbc8-4ce2" name="Armoured Decking**" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="02a1-664a-afc5-686f" name="Cor Caroli**" hidden="false" targetId="f151-e7cf-bb48-e823" type="rule"/>
-        <infoLink id="7c5f-5981-487f-1876" name="Elite Crew**" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
-        <infoLink id="fc68-79e0-05b1-925e" name="Powerslide*" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="832e-7782-02f0-aba5" name="Ikili Hull**" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
-        <infoLink id="24e8-5479-6f19-6f60" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="5e25-c710-4aa2-46c7" name="Heavy Firepower**" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="720b-49f8-f6ea-a411" name="Fortunes of War**" hidden="false" targetId="949d-d37f-c7c8-1093" type="rule"/>
-        <infoLink id="fc52-950d-6f44-f2dd" name="Portal Focus**" hidden="false" targetId="9702-61f2-9adf-2829" type="rule"/>
-        <infoLink id="0e25-ab28-4871-1bc7" name="Portal Mastery*" hidden="false" targetId="db90-0b63-d0f9-5222" type="rule"/>
+        <infoLink id="3af7-5c0c-223b-9cfb" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="e888-d9bf-fbc8-4ce2" name="Armoured Decking (3.04)" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
+        <infoLink id="02a1-664a-afc5-686f" name="Cor Caroli (3.04)" hidden="false" targetId="f151-e7cf-bb48-e823" type="rule"/>
+        <infoLink id="7c5f-5981-487f-1876" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
+        <infoLink id="fc68-79e0-05b1-925e" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="832e-7782-02f0-aba5" name="Ikili Hull (3.04)" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
+        <infoLink id="24e8-5479-6f19-6f60" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="5e25-c710-4aa2-46c7" name="Heavy Firepower (3.04)" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="720b-49f8-f6ea-a411" name="Fortunes of War (3.04)" hidden="false" targetId="949d-d37f-c7c8-1093" type="rule"/>
+        <infoLink id="fc52-950d-6f44-f2dd" name="Portal Focus (3.04)" hidden="false" targetId="9702-61f2-9adf-2829" type="rule"/>
+        <infoLink id="0e25-ab28-4871-1bc7" name="Portal Mastery (3.04)" hidden="false" targetId="db90-0b63-d0f9-5222" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="8ae0-147c-8429-29a6" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
         <categoryLink id="0aed-93f2-4e80-073c" name="Portalship" hidden="false" targetId="4ea2-ac64-84ea-ff57" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="3bd2-61f1-0939-e06e" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="110e-749a-0199-27be" type="selectionEntry">
+        <entryLink id="3bd2-61f1-0939-e06e" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7ab6-2302-b3c6-cfb1" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e49a-bc5e-a2f3-9e09" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="1271-ec9f-80d2-8a8f" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4f94-d4f4-bce9-b5ae" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="aa8f-af5c-cdc3-d1f1" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="1dcc-dcc4-d69e-8675" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9bd8-9277-3b47-a960" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="312d-4a8e-7893-29a9" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="1e6c-e45e-b685-1d6e" name="Twin Judgement Lances" hidden="false" collective="false" import="true" targetId="2b5a-ff6b-b80b-552a" type="selectionEntry">
           <modifiers>
@@ -7218,17 +7025,17 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6edd-0fb6-61dd-577e" type="min"/>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d25c-4ee3-49e7-4a7c" type="max"/>
-        <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7c22-c2e2-25e9-4f6b" type="max"/>
+        <constraint field="selections" scope="force" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7c22-c2e2-25e9-4f6b" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="7f38-16fd-bf95-fe74" name="Nemrut" hidden="false" targetId="6723-e94d-41c8-d442" type="profile"/>
-        <infoLink id="12de-3451-7aac-eff9" name="Agile*" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="12de-3451-7aac-eff9" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="89fb-4609-e07a-f338" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
         <infoLink id="0f76-44e1-c23e-5267" name="The Sultan’s Hammer**" hidden="false" targetId="0621-51de-26b8-202f" type="rule"/>
         <infoLink id="2bb2-1aea-eb5f-019b" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
         <infoLink id="763f-1588-acc1-f441" name="Ikili Hull**" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
         <infoLink id="51d3-f2b2-75bb-97c8" name="Two per Force**" hidden="false" targetId="ebed-2a52-5ef9-5148" type="rule"/>
-        <infoLink id="9d6d-a08d-3516-83f7" name="Vulnerable Stern*" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="9d6d-a08d-3516-83f7" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="2486-57ed-c4c2-5f7d" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -7244,81 +7051,43 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8b8b-7208-b4c5-4158" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="60f2-8d1d-110e-f771" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="366b-c73b-1c59-de8e" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="f7e0-fd3a-7201-ad0f" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0814-3ee9-3b02-b640" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="97fe-02e0-b633-408f" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="ebf7-2e5c-60ed-8d66" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="f7e0-fd3a-7201-ad0f" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="02b4-2fb6-42e5-18c2" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bd26-d8a8-2adb-ed2d" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="e34a-d9f3-1e1b-3534" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="95d8-5836-6a7d-8f12" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f14e-8474-ed20-7976" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="320d-afb0-4f5d-11d6" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="1249-69a1-6bc2-6cfd" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1b80-8a88-4d27-a8d5" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="34fe-362e-3da3-2e13" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="f4e5-818b-c998-c03d" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="57aa-3c0e-23de-bdc4" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="46ef-738f-656e-520f" type="max"/>
-          </constraints>
-        </entryLink>
+        <entryLink id="1249-69a1-6bc2-6cfd" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry"/>
+        <entryLink id="f4e5-818b-c998-c03d" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry"/>
         <entryLink id="afce-1bd2-11db-50fa" name="Orichalcite Flechette Launcher" hidden="false" collective="false" import="true" targetId="db84-1c9c-98de-aa16" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5b2d-95c9-aa0d-99a6" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="dbd8-6709-9205-1bef" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="b8a5-c2f9-c8c9-a4c3" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a75b-72ea-7d39-2f69" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c7b9-673e-8d5f-68a8" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="8028-bce1-829e-42a7" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6be9-8984-eac2-1dd3" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="afcc-3ff7-9637-b772" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -7333,13 +7102,13 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="4eac-9ddf-330c-eff7" name="Bayezid" hidden="false" targetId="e4dc-5c75-3ddb-595f" type="profile"/>
-        <infoLink id="02d6-a0ef-6ec1-695e" name="Ikili Hull**" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
-        <infoLink id="4f66-fb63-18d5-4bde" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="cf98-3831-4a54-5078" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="b03f-01f0-2793-46ed" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="0b72-5806-9232-f872" name="Maritime Patrol**" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
-        <infoLink id="56a0-5700-767b-0df3" name="Mine Sweeper**" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
-        <infoLink id="066c-7fdb-174d-a216" name="Vulnerable Stern**" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="02d6-a0ef-6ec1-695e" name="Ikili Hull (3.04)" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
+        <infoLink id="4f66-fb63-18d5-4bde" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="cf98-3831-4a54-5078" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="b03f-01f0-2793-46ed" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="0b72-5806-9232-f872" name="Maritime Patrol (3.04)" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
+        <infoLink id="56a0-5700-767b-0df3" name="Mine Sweeper (3.04)" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
+        <infoLink id="066c-7fdb-174d-a216" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="e74a-a97b-c2ae-6520" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -7480,10 +7249,6 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e167-349f-ff01-1c7d" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0b23-9356-6420-07c1" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="bd29-0d1f-faaf-7d94" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
@@ -7495,12 +7260,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
         </entryLink>
-        <entryLink id="7f82-8b46-aa75-40c8" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7024-1584-87a5-2275" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b89c-65ca-73c4-5b30" type="max"/>
-          </constraints>
-        </entryLink>
+        <entryLink id="7f82-8b46-aa75-40c8" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="160.0"/>
@@ -7514,16 +7274,16 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="c962-2d95-7f61-d6cb" name="Bursa" hidden="false" targetId="9f07-f179-d243-6c9e" type="profile"/>
-        <infoLink id="99d9-2221-b9b2-3914" name="Ikili Hull**" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
-        <infoLink id="d99c-0e01-a07e-1312" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="3ad1-c742-1f3c-a5b8" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="abea-46fc-8fe6-bdba" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="267b-46a6-5bdc-c6a6" name="Flak Barrage**" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
+        <infoLink id="99d9-2221-b9b2-3914" name="Ikili Hull (3.04)" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
+        <infoLink id="d99c-0e01-a07e-1312" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="3ad1-c742-1f3c-a5b8" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="abea-46fc-8fe6-bdba" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="267b-46a6-5bdc-c6a6" name="Flak Barrage (3.04)" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
             <modifier type="append" field="name" value="(5)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="fab3-f404-4e7b-8d47" name="Vulnerable Stern**" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="fab3-f404-4e7b-8d47" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="bdab-ed77-4b4c-b433" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -7742,35 +7502,18 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="892c-80e5-a516-ddfb" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2463-31d1-704e-3812" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="5ad9-0ef9-955a-a72d" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2383-e71a-bd15-8b61" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="84dc-3df7-61ed-4cc7" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="ae6d-93c6-d4b5-a5e1" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="409b-c744-b122-a6f7" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cbb6-658c-b9a6-2bfb" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="1a60-aaf1-46e4-1139" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="51b9-59cc-01e6-3d4c" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6452-1800-57ab-5554" type="max"/>
-          </constraints>
         </entryLink>
+        <entryLink id="1a60-aaf1-46e4-1139" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="175.0"/>
@@ -7784,11 +7527,11 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="f77c-2c1f-6e13-05ad" name="Konya" hidden="false" targetId="792c-0905-751f-fc66" type="profile"/>
-        <infoLink id="21ae-2e55-0851-062a" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="cfcd-8088-dcf5-efe0" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="1444-0ef3-fe72-a808" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="362e-eb23-1129-4c5c" name="Skiff Dock**" hidden="false" targetId="9c22-14a9-21ca-d77f" type="rule"/>
-        <infoLink id="c713-a5ae-6b91-fd0b" name="Advanced Repair Facilities**" hidden="false" targetId="6381-3c0e-84c8-6b3b" type="rule">
+        <infoLink id="21ae-2e55-0851-062a" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="cfcd-8088-dcf5-efe0" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="1444-0ef3-fe72-a808" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="362e-eb23-1129-4c5c" name="Assigned Skiff Escort (3.04)" hidden="false" targetId="a04c-fb04-159e-ff33" type="rule"/>
+        <infoLink id="c713-a5ae-6b91-fd0b" name="Advanced Repair Facilities (3.04)" hidden="false" targetId="6381-3c0e-84c8-6b3b" type="rule">
           <modifiers>
             <modifier type="append" field="name" value="(2)"/>
           </modifiers>
@@ -7796,6 +7539,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <infoLink id="dded-612f-7ff3-e1c7" name="Gun Runner**" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
         <infoLink id="b49b-5529-1587-0666" name="Vulnerable Stern**" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
         <infoLink id="f425-4426-a3c3-2bef" name="Heavy Escort**" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
+        <infoLink id="3acd-fdd0-1188-aa44" name="Skiff Dock (3.04)" hidden="false" targetId="9c22-14a9-21ca-d77f" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="e8c5-eedc-0d80-a576" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -7806,28 +7550,16 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e832-6bc9-00d4-c846" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bfbf-7b54-a826-5bcf" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="915c-06c7-f6bf-a492" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7b50-3f1d-7287-265b" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="86a1-55a2-4a40-ccd7" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="ce9f-e591-976b-78a2" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6947-b460-8ebf-a48d" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="020a-7aac-4161-182d" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -7835,20 +7567,20 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="e886-b4b1-b50d-bd52" name="Morea" publicationId="d854-a2d6-3d52-44c4" page="22" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="e886-b4b1-b50d-bd52" name="Morea" publicationId="d854-a2d6-3d52-44c4" page="22" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="106e-1243-ece1-49d0" type="min"/>
         <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4300-dcb6-e5ba-b356" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="5236-07e5-42ee-be45" name="Morea" hidden="false" targetId="108a-b192-cc49-631c" type="profile"/>
-        <infoLink id="9a92-8fcf-95ec-3ac6" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="d8a9-cdb0-f094-320c" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="23cf-c251-1524-5dd2" name="Mine Sweeper**" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
-        <infoLink id="2eb5-08e3-01ea-9141" name="Mine Layer**" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
-        <infoLink id="830a-35b4-85d0-da54" name="Gun Runner**" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
-        <infoLink id="ff3a-a546-643d-13b9" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="8f86-0161-51ee-8cec" name="Vulnerable Stern**" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="9a92-8fcf-95ec-3ac6" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="d8a9-cdb0-f094-320c" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="23cf-c251-1524-5dd2" name="Mine Sweeper (3.04)" hidden="false" targetId="3c38-dac5-4a88-5358" type="rule"/>
+        <infoLink id="2eb5-08e3-01ea-9141" name="Mine Layer (3.04)" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
+        <infoLink id="830a-35b4-85d0-da54" name="Gun Runner (3.04)" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
+        <infoLink id="ff3a-a546-643d-13b9" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="8f86-0161-51ee-8cec" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="b06a-d310-0a61-d00a" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -7873,12 +7605,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7791-518b-ec32-5185" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="bfd6-31df-b795-7197" name="Mirage generator" hidden="false" collective="false" import="true" targetId="163e-8002-bc82-d20f" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7748-31c2-78c0-fc06" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b9bb-a994-9bde-4d60" type="max"/>
-          </constraints>
-        </entryLink>
+        <entryLink id="bfd6-31df-b795-7197" name="Mirage generator" hidden="false" collective="false" import="true" targetId="163e-8002-bc82-d20f" type="selectionEntry"/>
         <entryLink id="659c-6615-35e7-36b5" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
@@ -7901,18 +7628,20 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="b621-fee9-c604-0c78" name="Abydos" hidden="false" targetId="24a4-9e2d-89cc-eb6e" type="profile"/>
-        <infoLink id="adfd-d41b-3ab7-183f" name="Advanced Repair Facilities" hidden="false" targetId="6381-3c0e-84c8-6b3b" type="rule">
+        <infoLink id="adfd-d41b-3ab7-183f" name="Advanced Repair Facilities (3.04)" hidden="false" targetId="6381-3c0e-84c8-6b3b" type="rule">
           <modifiers>
             <modifier type="append" field="name" value=" (4)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="0a3b-edea-f47b-3ba3" name="Armoured Decking" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
+        <infoLink id="0a3b-edea-f47b-3ba3" name="Assigned Skiff Escort (3.04)" hidden="false" targetId="a04c-fb04-159e-ff33" type="rule"/>
         <infoLink id="12ff-4754-4fb5-88cd" name="Large Target**" hidden="false" targetId="5b16-04f1-a7a8-d2e0" type="rule"/>
-        <infoLink id="1c33-1c35-c5b9-70bd" name="Heavy Firepower**" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="1c33-1c35-c5b9-70bd" name="Heavy Escort (3.04)" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
         <infoLink id="5b2b-0351-6fc1-c4fc" name="Skiff Dock**" hidden="false" targetId="9c22-14a9-21ca-d77f" type="rule"/>
         <infoLink id="4388-f1b2-5092-d335" name="Supply Depot**" hidden="false" targetId="23f5-7a90-116f-cba1" type="rule"/>
         <infoLink id="1972-5aa2-f9f8-3eef" name="Skiff Dock**" hidden="false" targetId="9c22-14a9-21ca-d77f" type="rule"/>
         <infoLink id="7534-956c-05a5-e945" name="Logistical Support**" hidden="false" targetId="408e-7b40-68d7-059f" type="rule"/>
+        <infoLink id="926a-bd59-77e4-5248" name="Heavy Firepower (3.04)" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="4e41-2388-d1d6-f2eb" name="Armoured Decking (3.04)" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="3541-7a66-642c-0237" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -8135,24 +7864,19 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="966d-8061-a5b7-b949" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8df5-0aa8-b0db-27c5" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b46b-247f-564c-889d" type="max"/>
-          </constraints>
-        </entryLink>
         <entryLink id="2820-51b4-cb4e-35b9" name="Heavy Rocket Battery" hidden="false" collective="false" import="true" targetId="f7e0-fd3a-7201-ad0f" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8431-69bd-b9b6-569a" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a33d-af75-6586-ca5a" type="max"/>
-          </constraints>
+        </entryLink>
+        <entryLink id="4974-be1e-d5c6-6a94" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
+          <modifiers>
+            <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
+          </modifiers>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="395.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="320.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -8163,15 +7887,15 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="c18b-ca89-58fb-747c" name="Topkapi" hidden="false" targetId="2913-8bc9-b9fd-9ec8" type="profile"/>
-        <infoLink id="2467-e14f-9a04-5692" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="7764-d6f6-d5a5-b361" name="Combat Air Patrol**" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
-        <infoLink id="7cc2-0ca8-f541-75f5" name="Heavy Firepower**" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="460d-6874-4869-4943" name="Ikili Hull**" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
-        <infoLink id="cabb-96ee-9923-7447" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="a894-1c2a-968a-f75f" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="4d1b-c3fb-b7e2-e8c9" name="SRS Mine Clearance**" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
-        <infoLink id="e39e-3eaa-66f2-f5cc" name="SRS Recon**" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
-        <infoLink id="8c8a-53f1-ce02-c66d" name="SRS Portal Strike**" hidden="false" targetId="e76e-276f-d917-c7a4" type="rule"/>
+        <infoLink id="2467-e14f-9a04-5692" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="7764-d6f6-d5a5-b361" name="Combat Air Patrol (3.04)" hidden="false" targetId="5eca-214c-5274-55db" type="rule"/>
+        <infoLink id="7cc2-0ca8-f541-75f5" name="Heavy Firepower (3.04)" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="460d-6874-4869-4943" name="Ikili Hull (3.04)" hidden="false" targetId="a0e5-69d2-4798-ec1d" type="rule"/>
+        <infoLink id="cabb-96ee-9923-7447" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="a894-1c2a-968a-f75f" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="4d1b-c3fb-b7e2-e8c9" name="SRS Mine Clearance (3.04)" hidden="false" targetId="b8d7-281f-b227-a523" type="rule"/>
+        <infoLink id="e39e-3eaa-66f2-f5cc" name="SRS Recon (3.04)" hidden="false" targetId="0a26-0b4a-261f-3db0" type="rule"/>
+        <infoLink id="8c8a-53f1-ce02-c66d" name="SRS Portal Strike (3.04)" hidden="false" targetId="e76e-276f-d917-c7a4" type="rule"/>
         <infoLink id="3b10-56f4-7c25-7ad2" name="Vulnerable Stern**" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
       </infoLinks>
       <categoryLinks>
@@ -8202,58 +7926,28 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d00b-ab91-62a1-0473" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="22f4-7a10-3b89-855f" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="5e6e-49da-980f-7c12" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5d1c-b81f-87fe-5cad" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fb17-c812-c0fe-36f5" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="d83f-8b1f-88ed-ef2f" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cb02-e01e-0e66-cc0c" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bb29-48e9-872d-2905" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="3f41-e98c-8d0e-3a3f" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4836-b0ae-4f91-31c0" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6b70-2482-0217-183f" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="57a5-5036-a73e-ee2d" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="817c-4337-995f-4bdd" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d041-bb1a-ab9e-4c1d" type="max"/>
-          </constraints>
         </entryLink>
+        <entryLink id="3f41-e98c-8d0e-3a3f" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry"/>
+        <entryLink id="57a5-5036-a73e-ee2d" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry"/>
         <entryLink id="8aff-635e-537c-aa2e" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4e80-de67-db59-283a" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2af1-1361-2f22-f82a" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="74b0-54c7-9e61-13dc" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b809-acd6-7edc-c382" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7679-3668-72d4-564f" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -8358,10 +8052,10 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="4cec-f2f7-f0ee-91a0" name="Jebel" hidden="false" targetId="dfe8-46cc-8efe-ed2b" type="profile"/>
-        <infoLink id="daec-2b1b-817f-f758" name="Forward Deployment*" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
-        <infoLink id="916d-27fc-05e3-29be" name="Heavy Escort*" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
-        <infoLink id="8115-ed79-7fe9-5f3e" name="Immobile*" hidden="false" targetId="8aa1-f648-12bd-a1c6" type="rule"/>
-        <infoLink id="c705-3c44-4e88-a98d" name="Strategic Asset*" hidden="false" targetId="12ec-f9c6-b68b-913b" type="rule"/>
+        <infoLink id="daec-2b1b-817f-f758" name="Forward Deployment (3.04)" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
+        <infoLink id="916d-27fc-05e3-29be" name="Heavy Escort (3.04)" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
+        <infoLink id="8115-ed79-7fe9-5f3e" name="Immobile (3.04)" hidden="false" targetId="8aa1-f648-12bd-a1c6" type="rule"/>
+        <infoLink id="c705-3c44-4e88-a98d" name="Strategic Asset (3.04)" hidden="false" targetId="12ec-f9c6-b68b-913b" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="8bc7-ecc3-dcab-6408" name="Battle Platform" hidden="false" targetId="01dc-4e4e-4369-9216" primary="false"/>
@@ -8373,100 +8067,30 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d3c7-af8d-1742-1237" type="min"/>
             <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a6dd-fb00-b781-72e8" type="max"/>
           </constraints>
-          <selectionEntryGroups>
-            <selectionEntryGroup id="729b-b8dc-dc06-6691" name="First" hidden="false" collective="false" import="true">
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8751-c7f8-a771-61f9" type="max"/>
-              </constraints>
-              <entryLinks>
-                <entryLink id="2c14-716a-0454-3cc8" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
-                  </modifiers>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="2e1e-d3cd-346d-adbb" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
-                  </modifiers>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="13.0"/>
-                  </costs>
-                </entryLink>
-              </entryLinks>
-            </selectionEntryGroup>
-            <selectionEntryGroup id="41ee-1531-1e65-0008" name="Second" hidden="false" collective="false" import="true">
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b9da-2b63-1236-c8ce" type="max"/>
-              </constraints>
-              <entryLinks>
-                <entryLink id="7122-5af6-b195-09de" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
-                  </modifiers>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="07df-f9bf-a77e-a9d9" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
-                  </modifiers>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="13.0"/>
-                  </costs>
-                </entryLink>
-              </entryLinks>
-            </selectionEntryGroup>
-            <selectionEntryGroup id="cefc-5c9d-e23f-6362" name="Third" hidden="false" collective="false" import="true">
+          <entryLinks>
+            <entryLink id="bdbf-369d-efa2-8b25" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a1c0-08e8-dffa-c7f8" type="max"/>
+                <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c49f-a4c6-701e-c6a0" type="max"/>
               </constraints>
-              <entryLinks>
-                <entryLink id="be7e-8498-a93d-798a" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
-                  </modifiers>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="b48b-5d8c-b371-1522" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
-                  </modifiers>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="13.0"/>
-                  </costs>
-                </entryLink>
-              </entryLinks>
-            </selectionEntryGroup>
-            <selectionEntryGroup id="f6da-c10e-c93a-ff97" name="Fourth" hidden="false" collective="false" import="true">
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="13.0"/>
+              </costs>
+            </entryLink>
+            <entryLink id="e4bc-a3ea-3d9d-a462" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
+              </modifiers>
               <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="78ad-54db-afcd-a2a8" type="max"/>
+                <constraint field="selections" scope="parent" value="4.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3ffe-0d56-624d-2249" type="max"/>
               </constraints>
-              <entryLinks>
-                <entryLink id="74f5-75aa-ef98-01ea" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
-                  </modifiers>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
-                  </costs>
-                </entryLink>
-                <entryLink id="ed3b-0429-3305-4d4a" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
-                  <modifiers>
-                    <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
-                  </modifiers>
-                  <costs>
-                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="13.0"/>
-                  </costs>
-                </entryLink>
-              </entryLinks>
-            </selectionEntryGroup>
-          </selectionEntryGroups>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
+              </costs>
+            </entryLink>
+          </entryLinks>
         </selectionEntryGroup>
         <selectionEntryGroup id="d7f8-6beb-d33d-b8cf" name="Main Weapon" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" defaultSelectionEntryId="bf6b-14b1-5b43-82dc">
           <constraints>
@@ -8517,11 +8141,11 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9912-c3dd-b674-f278" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="3032-fa3c-48e9-321e" name="Khomas" hidden="false" targetId="e2f9-31d5-8cdf-e688" type="profile"/>
-        <infoLink id="8a56-49af-3685-86aa" name="Forward Deployment" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
-        <infoLink id="0f09-f5cf-634d-91f3" name="Heavy Escort" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
-        <infoLink id="45aa-bab3-8faa-4ca7" name="Immobile" hidden="false" targetId="8aa1-f648-12bd-a1c6" type="rule"/>
-        <infoLink id="763a-2a4d-ed60-c862" name="Strategic Asset" hidden="false" targetId="12ec-f9c6-b68b-913b" type="rule"/>
+        <infoLink id="3032-fa3c-48e9-321e" name="Khoms" hidden="false" targetId="e2f9-31d5-8cdf-e688" type="profile"/>
+        <infoLink id="8a56-49af-3685-86aa" name="Forward Deployment (3.04)" hidden="false" targetId="e8f8-a4d2-d40c-1467" type="rule"/>
+        <infoLink id="0f09-f5cf-634d-91f3" name="Heavy Escort (3.04)" hidden="false" targetId="24cb-6c34-eb5b-7dde" type="rule"/>
+        <infoLink id="45aa-bab3-8faa-4ca7" name="Immobile (3.04)" hidden="false" targetId="8aa1-f648-12bd-a1c6" type="rule"/>
+        <infoLink id="763a-2a4d-ed60-c862" name="Strategic Asset (3.04)" hidden="false" targetId="12ec-f9c6-b68b-913b" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="6f29-f9f2-471b-bd09" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -8830,14 +8454,6 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
                 <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="25.0"/>
               </costs>
             </entryLink>
-            <entryLink id="886f-a525-f383-8fae" name="Mirage generator" hidden="false" collective="false" import="true" targetId="e8d8-3cbf-4858-aa61" type="selectionEntry">
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1c13-e8fa-eca8-bd5d" type="max"/>
-              </constraints>
-              <costs>
-                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="25.0"/>
-              </costs>
-            </entryLink>
             <entryLink id="5674-5e68-f93b-408c" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d2f9-34dd-25bc-d72d" type="max"/>
@@ -8882,7 +8498,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="3931-ac84-1c05-bdde" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
-        <categoryLink id="5f5d-34c8-8852-d08d" name="Destroyer" hidden="false" targetId="63a3-004a-8e9f-2eb4" primary="false"/>
+        <categoryLink id="e93c-5429-0cf2-6e7d" name="Fast Skimmer" hidden="false" targetId="8383-53fc-d230-487a" primary="false"/>
       </categoryLinks>
       <selectionEntryGroups>
         <selectionEntryGroup id="a2a1-3717-e479-1b92" name="Main Weapon" hidden="false" collective="false" import="true">
@@ -8891,7 +8507,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c2f7-c6b5-6326-84ab" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="f403-535e-b360-b152" name="Port" hidden="false" collective="false" import="true" defaultSelectionEntryId="d81c-c73f-403a-df6c">
+            <selectionEntryGroup id="f403-535e-b360-b152" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="d81c-c73f-403a-df6c">
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c496-6bbc-083d-7b70" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cb04-ad68-512b-c03a" type="max"/>
@@ -8899,7 +8515,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
               <entryLinks>
                 <entryLink id="a379-4665-2f08-2ba1" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                   <modifiers>
-                    <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
+                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c99b-141f-0594-3259" type="max"/>
@@ -8910,7 +8526,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
                 </entryLink>
                 <entryLink id="d81c-c73f-403a-df6c" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
                   <modifiers>
-                    <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
+                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e373-5ffd-f43e-cee7" type="max"/>
@@ -8918,7 +8534,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
                 </entryLink>
                 <entryLink id="c99e-c694-442e-9293" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
                   <modifiers>
-                    <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
+                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d394-f953-de7c-1559" type="max"/>
@@ -8926,7 +8542,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="bdea-2edd-6c0d-cfa6" name="Starboard" hidden="false" collective="false" import="true" defaultSelectionEntryId="6b76-4b94-1bd9-4e05">
+            <selectionEntryGroup id="bdea-2edd-6c0d-cfa6" name="Rear" hidden="false" collective="false" import="true" defaultSelectionEntryId="6b76-4b94-1bd9-4e05">
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0a81-a587-2dd0-94b6" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3f66-7878-6910-5da0" type="max"/>
@@ -8934,7 +8550,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
               <entryLinks>
                 <entryLink id="7636-f093-ec40-b0b1" name="Aetheric Lance" hidden="false" collective="false" import="true" targetId="e3d2-a74b-69dd-e97a" type="selectionEntry">
                   <modifiers>
-                    <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
+                    <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a2b5-5b51-cb41-8c67" type="max"/>
@@ -8945,7 +8561,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
                 </entryLink>
                 <entryLink id="6b76-4b94-1bd9-4e05" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
                   <modifiers>
-                    <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
+                    <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fba5-847b-67d1-9c2e" type="max"/>
@@ -8953,7 +8569,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
                 </entryLink>
                 <entryLink id="c6d2-2916-f52f-a955" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
                   <modifiers>
-                    <modifier type="add" field="category" value="5b70-4095-b55c-9745"/>
+                    <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
                   </modifiers>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f09f-249a-969b-58ab" type="max"/>
@@ -8965,23 +8581,10 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="2daf-0d1b-1b33-f562" name="Light Broadside" hidden="false" collective="false" import="true" targetId="fc11-e98a-2d7f-198c" type="selectionEntry">
+        <entryLink id="b42e-3f25-08b1-7789" name="Light Broadside" hidden="false" collective="false" import="true" targetId="fc11-e98a-2d7f-198c" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2ada-1916-6582-ace1" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2222-1286-4933-b00e" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="6064-9f8b-da7c-dab2" name="Micro Torpedo Salvo" hidden="false" collective="false" import="true" targetId="ca1a-2241-066b-449a" type="selectionEntry">
-          <modifiers>
-            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f67a-5d99-6bd7-6375" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a13f-dbb0-6971-35af" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -8996,8 +8599,9 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="05e5-c717-75e2-2248" name="Agile*" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="a32a-d604-0172-3bd8" name="Armoured Decking" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
+        <infoLink id="a32a-d604-0172-3bd8" name="Armoured Decking (3.04)" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
         <infoLink id="ddf7-dd5d-bf6b-a514" name="Mandjet" hidden="false" targetId="c8ca-df09-bf4a-a1e2" type="profile"/>
+        <infoLink id="e68f-8657-cbb4-593e" name="Focused Gunnery (3.04)" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="e57e-e6eb-2ca4-0b74" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -9006,7 +8610,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       <selectionEntries>
         <selectionEntry id="905e-8557-16c7-db9a" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="aaa5-9edc-86d4-958c" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="aaa5-9edc-86d4-958c" type="max"/>
           </constraints>
           <infoLinks>
             <infoLink id="881c-e631-d4de-e46b" name="SRS" hidden="false" targetId="b5a8-5584-f221-f445" type="profile">
@@ -9236,27 +8840,23 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0ce7-84af-8811-9fe3" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="584e-b729-9d45-7bee" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="b7dd-b2c4-86df-95c6" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+        <entryLink id="94b0-302d-46e7-7172" name="Heavy Magnetic Bombard" hidden="false" collective="false" import="true" targetId="0473-4529-d230-ee46" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d7ca-c075-1f6e-1135" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e5ac-2fbb-1f90-2e40" type="max"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ee4c-1177-6825-73f6" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ebe9-1e0f-49b6-838e" type="max"/>
           </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="135.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="138.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="af82-5b49-3185-fb4e" name="Mesektet" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="af82-5b49-3185-fb4e" name="Mesektet" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0b17-422a-0196-f71e" type="min"/>
         <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="59b4-df93-4710-30af" type="max"/>
@@ -9274,7 +8874,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       <selectionEntries>
         <selectionEntry id="e78d-ab61-820d-6ee5" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="07b5-e61b-3a58-7946" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="07b5-e61b-3a58-7946" type="max"/>
           </constraints>
           <infoLinks>
             <infoLink id="efd7-2e30-6c0c-7d8c" name="SRS" hidden="false" targetId="b5a8-5584-f221-f445" type="profile">
@@ -9412,27 +9012,19 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1568-9d86-b8f7-e278" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="af88-f4ce-17b8-1e0b" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="2a21-dc26-96de-5c10" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="35e0-510f-98c4-074a" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d353-31e1-ea49-f6df" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="130.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="122.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="49c8-4b51-3481-235f" name="Sabah" publicationId="d854-a2d6-3d52-44c4" page="" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="49c8-4b51-3481-235f" name="Sabah" publicationId="d854-a2d6-3d52-44c4" page="" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="35ba-c6a0-9340-adda" type="min"/>
         <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2869-025a-d150-ea73" type="max"/>
@@ -9440,8 +9032,9 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       <infoLinks>
         <infoLink id="12ba-c381-5adc-114e" name="Agile" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
         <infoLink id="8ad1-d63d-091d-4029" name="Armoured Decking" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="fbd6-28b2-730b-c874" name="Spotter" hidden="false" targetId="063a-3229-1f27-a3c2" type="rule"/>
+        <infoLink id="fbd6-28b2-730b-c874" name="Rocket Barrage (3.04)" hidden="false" targetId="1042-355a-94f3-b6be" type="rule"/>
         <infoLink id="8e74-ad72-5738-d090" name="Sabah" hidden="false" targetId="9ab5-7356-9a2e-dcb1" type="profile"/>
+        <infoLink id="856e-b4fa-9da0-6541" name="Spotter (3.04)" hidden="false" targetId="063a-3229-1f27-a3c2" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="1049-6742-9342-38ed" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -9450,12 +9043,12 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       <selectionEntries>
         <selectionEntry id="4adb-95e1-ee2d-8e10" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d14d-409a-4782-c8b1" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d14d-409a-4782-c8b1" type="max"/>
           </constraints>
           <infoLinks>
             <infoLink id="d347-ef6b-0f5b-436b" name="SRS" hidden="false" targetId="b5a8-5584-f221-f445" type="profile">
               <modifiers>
-                <modifier type="set" field="38e6-209c-1587-2cd0" value="2/1"/>
+                <modifier type="set" field="38e6-209c-1587-2cd0" value="1/0"/>
                 <modifier type="set" field="name" value="Khepri SRS"/>
               </modifiers>
             </infoLink>
@@ -9463,7 +9056,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <infoLink id="e256-2a83-2e44-d965" name="Khepri SRS Capacity**" hidden="false" targetId="4fec-a47c-2c2e-b9ea" type="rule"/>
           </infoLinks>
           <costs>
-            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="20.0"/>
+            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="15.0"/>
             <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
           </costs>
         </selectionEntry>
@@ -9553,10 +9146,6 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0f3f-a4ae-10b2-7feb" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="257a-59da-ab72-6bdc" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="5f4c-f067-0b97-2fcf" name="Salvo Missile Silo" hidden="false" collective="false" import="true" targetId="6a66-1016-ae4a-e291" type="selectionEntry">
           <modifiers>
@@ -9567,22 +9156,13 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8be6-bdbc-d966-ec7d" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="5647-56fe-6d81-0ac2" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
-          <modifiers>
-            <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="86e0-016a-27b2-c7ab" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8d0f-b6fd-8ca6-c0d8" type="max"/>
-          </constraints>
-        </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="130.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="120.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="fcb1-b68b-1d9d-1565" name="Sobek" hidden="false" collective="false" import="true" type="unit">
+    <selectionEntry id="fcb1-b68b-1d9d-1565" name="Sobek" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="17a0-3341-e04f-ea39" type="min"/>
         <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="55dd-189a-5be0-55ee" type="max"/>
@@ -9601,7 +9181,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       <selectionEntries>
         <selectionEntry id="137b-bf5a-cf57-7e24" name="Khepri SRS" hidden="false" collective="false" import="true" type="upgrade">
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="74da-b1ea-e04d-15b2" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="74da-b1ea-e04d-15b2" type="max"/>
           </constraints>
           <infoLinks>
             <infoLink id="24fa-2419-d16e-002a" name="SRS" hidden="false" targetId="b5a8-5584-f221-f445" type="profile">
@@ -9620,7 +9200,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         </selectionEntry>
       </selectionEntries>
       <selectionEntryGroups>
-        <selectionEntryGroup id="4d44-564e-b206-bf5f" name="Main Weapon" hidden="false" collective="false" import="true">
+        <selectionEntryGroup id="4d44-564e-b206-bf5f" name="Secondary Weapon" hidden="false" collective="false" import="true">
           <constraints>
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3688-ef2b-6041-829e" type="min"/>
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a633-5203-deb9-e390" type="max"/>
@@ -9698,29 +9278,97 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             </selectionEntryGroup>
           </selectionEntryGroups>
         </selectionEntryGroup>
+        <selectionEntryGroup id="5bf8-8e56-e8a1-eb3c" name="Main Weapon" page="" hidden="false" collective="false" import="true">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="829b-3441-4a2a-bc9d" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8c62-c567-4510-88ff" type="max"/>
+          </constraints>
+          <selectionEntryGroups>
+            <selectionEntryGroup id="bed0-2c94-bd85-1840" name="Generator" hidden="false" collective="false" import="true">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0d31-d525-2f56-dca8" type="max"/>
+              </constraints>
+              <categoryLinks>
+                <categoryLink id="85a4-bc20-ce7b-6f28" name="Generator" hidden="false" targetId="25b9-7f26-cbd9-e68f" primary="false"/>
+              </categoryLinks>
+              <entryLinks>
+                <entryLink id="2dc8-d645-3cdb-f86f" name="Atomic generator" hidden="false" collective="false" import="true" targetId="eef0-442d-aa6f-b314" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="fbb2-f9d6-5171-131f" name="Fury generator" hidden="false" collective="false" import="true" targetId="069a-8c90-088f-816d" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="92c7-e0ef-139e-eb92" name="Magnetic generator" hidden="false" collective="false" import="true" targetId="77af-dd4b-51e7-c620" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="7f25-dc30-c205-c2b2" name="Mirage generator" hidden="false" collective="false" import="true" targetId="e8d8-3cbf-4858-aa61" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="fe14-7e38-e9f0-adb7" name="Repulsion field generator" hidden="false" collective="false" import="true" targetId="bf96-7810-7d69-a386" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="7473-bac5-1a8c-021d" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="95c0-80ce-310b-8684" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="d54b-d968-1fb2-5438" name="Shroud generator" hidden="false" collective="false" import="true" targetId="1543-05e3-58ac-6e6d" type="selectionEntry">
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="-5.0"/>
+                  </costs>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+            <selectionEntryGroup id="ffb6-aeb5-24d7-8c88" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="1452-9d34-f84e-6a95">
+              <modifiers>
+                <modifier type="set" field="1b2b-f1d9-d73f-3e9c" value="0.0">
+                  <conditions>
+                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="25b9-7f26-cbd9-e68f" type="atLeast"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1b2b-f1d9-d73f-3e9c" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c946-4e14-1ea7-58e9" type="max"/>
+              </constraints>
+              <entryLinks>
+                <entryLink id="1452-9d34-f84e-6a95" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9ae6-177d-d3b0-9762" type="max"/>
+                  </constraints>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+          </selectionEntryGroups>
+        </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
         <entryLink id="f56c-beaf-5b10-7273" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a8bf-ca28-f837-40b4" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="76e8-941d-601d-59a2" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="bee4-211b-c11e-462a" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
-          <modifiers>
-            <modifier type="add" field="category" value="0cd5-1e4e-c51e-c338"/>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0af9-d54c-607e-cf56" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2576-b8f2-756f-244a" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="125.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="118.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -9730,12 +9378,12 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <constraint field="selections" scope="parent" value="6.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="50aa-9226-a647-d880" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="1a47-5f1e-307b-d88a" name="Agile*" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="1d52-c1c0-0996-179b" name="Giant Slayer*" hidden="false" targetId="0d99-00ae-4c22-20b7" type="rule"/>
-        <infoLink id="f4b7-588f-8865-fd9c" name="Linear Dash" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
-        <infoLink id="5d88-c52c-d5e2-74ed" name="Powerslide*" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="eb42-783d-5026-9aab" name="Vulnerable Stern*" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
-        <infoLink id="cc94-706b-a47f-73fe" name="Corvette Duty*" hidden="false" targetId="4836-a907-b316-55b2" type="rule"/>
+        <infoLink id="1a47-5f1e-307b-d88a" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="1d52-c1c0-0996-179b" name="Giant Slayer (3.04)" hidden="false" targetId="0d99-00ae-4c22-20b7" type="rule"/>
+        <infoLink id="f4b7-588f-8865-fd9c" name="Linear Dash (3.04)" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
+        <infoLink id="5d88-c52c-d5e2-74ed" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="eb42-783d-5026-9aab" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="cc94-706b-a47f-73fe" name="Corvette Duty (3.04)" hidden="false" targetId="4836-a907-b316-55b2" type="rule"/>
         <infoLink id="5af4-e92f-57a8-fe1b" name="Alsaqr" hidden="false" targetId="2955-837e-d457-8fd0" type="profile"/>
       </infoLinks>
       <categoryLinks>
@@ -9780,6 +9428,32 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <infoLink id="f253-77cb-62fd-75b2" name="Vanguard*" hidden="false" targetId="f721-8318-3875-0140" type="rule"/>
         <infoLink id="42d8-9372-cd4c-4bcc" name="Vulnerable Stern*" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
         <infoLink id="9a22-b5b2-0752-eaf5" name="Awsbiri" hidden="false" targetId="515f-4ea8-7919-b3f7" type="profile"/>
+        <infoLink id="a1d6-2fdb-adf4-459b" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule">
+          <modifiers>
+            <modifier type="set" field="hidden" value="true">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="notInstanceOf"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+        </infoLink>
+        <infoLink id="0571-3f9d-ed67-e910" name="Luminiferous Defences (3.04)" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule">
+          <modifiers>
+            <modifier type="set" field="hidden" value="true">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="notInstanceOf"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+        </infoLink>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="85e1-d036-1108-4998" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -9870,10 +9544,6 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8538-5bb8-0f6e-ce41" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7b00-f18c-adbe-0e82" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="ed4b-2895-54de-7858" name="Aerial Torpedo Salvo" hidden="false" collective="false" import="true" targetId="09d0-01c4-9075-9480" type="selectionEntry">
           <modifiers>
@@ -9897,16 +9567,16 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="aad4-624f-8763-8e15" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="c626-59d5-b77a-d9f1" name="Armoured Decking**" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="bdb4-63ac-8310-9119" name="Celerity*" hidden="false" targetId="e0a4-52b6-676c-9b6d" type="rule"/>
-        <infoLink id="dcde-dd85-8a66-94ad" name="Inspirational" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
-        <infoLink id="5972-61ab-0c1d-6a5c" name="Strategic Withdrawal" hidden="false" targetId="950e-974b-d566-0e66" type="rule"/>
-        <infoLink id="d77a-dc38-0e18-53f5" name="Colossus**" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
-        <infoLink id="ec7a-3554-1b38-5b15" name="Cor Caroli*" hidden="false" targetId="f151-e7cf-bb48-e823" type="rule"/>
-        <infoLink id="3a1c-7f48-e3fa-bd6d" name="Elite Crew" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
-        <infoLink id="2cb8-7ab4-f690-852e" name="Powerslide" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="8ca6-9629-1d96-9b3d" name="Unexpected Arrival" hidden="false" targetId="f4aa-042e-34e5-1938" type="rule"/>
-        <infoLink id="9a45-ad8e-27b5-3a3a" name="Vigour**" hidden="false" targetId="91f7-3138-f1c6-4770" type="rule"/>
+        <infoLink id="c626-59d5-b77a-d9f1" name="Armoured Decking (3.04)" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
+        <infoLink id="bdb4-63ac-8310-9119" name="Celerity (3.04)" hidden="false" targetId="e0a4-52b6-676c-9b6d" type="rule"/>
+        <infoLink id="dcde-dd85-8a66-94ad" name="Inspirational (3.04)" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
+        <infoLink id="5972-61ab-0c1d-6a5c" name="Strategic Withdrawal (3.04)" hidden="false" targetId="950e-974b-d566-0e66" type="rule"/>
+        <infoLink id="d77a-dc38-0e18-53f5" name="Colossus (3.04)" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
+        <infoLink id="ec7a-3554-1b38-5b15" name="Cor Caroli (3.04)" hidden="false" targetId="f151-e7cf-bb48-e823" type="rule"/>
+        <infoLink id="3a1c-7f48-e3fa-bd6d" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
+        <infoLink id="2cb8-7ab4-f690-852e" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="8ca6-9629-1d96-9b3d" name="Unexpected Arrival (3.04)" hidden="false" targetId="f4aa-042e-34e5-1938" type="rule"/>
+        <infoLink id="9a45-ad8e-27b5-3a3a" name="Vigour (3.04)" hidden="false" targetId="91f7-3138-f1c6-4770" type="rule"/>
         <infoLink id="b1b0-fc20-4ff0-82f1" name="Chaska" hidden="false" targetId="27ce-8bc7-7c97-9a8d" type="profile"/>
       </infoLinks>
       <categoryLinks>
@@ -10005,12 +9675,38 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1b38-41c9-d8dd-3c59" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="f688-89c3-160b-6b6d" name="Agile" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="9b87-7656-3eac-0127" name="Linear Dash" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
-        <infoLink id="2e94-d923-aec4-b5c6" name="Powerslide*" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="0960-67c2-a282-45c6" name="Skyfire*" hidden="false" targetId="1083-2af1-7bfc-7a55" type="rule"/>
-        <infoLink id="9c7c-ce68-02ed-d3ca" name="Vulnerable Stern*" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
+        <infoLink id="f688-89c3-160b-6b6d" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="9b87-7656-3eac-0127" name="Linear Dash (3.04)" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
+        <infoLink id="2e94-d923-aec4-b5c6" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="0960-67c2-a282-45c6" name="Skyfire (3.04)" hidden="false" targetId="1083-2af1-7bfc-7a55" type="rule"/>
+        <infoLink id="9c7c-ce68-02ed-d3ca" name="Vulnerable Stern (3.04)" hidden="false" targetId="ac3f-24c4-12e2-f3f1" type="rule"/>
         <infoLink id="fe10-5763-145f-abb4" name="Nasr" hidden="false" targetId="9cc1-8cb2-dece-7561" type="profile"/>
+        <infoLink id="8cd0-9c97-1a67-b08a" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule">
+          <modifiers>
+            <modifier type="set" field="hidden" value="true">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="notInstanceOf"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+        </infoLink>
+        <infoLink id="aecd-6582-f8a7-7fa3" name="Luminiferous Defences (3.04)" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule">
+          <modifiers>
+            <modifier type="set" field="hidden" value="true">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="notInstanceOf"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+        </infoLink>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="9059-da4a-83e9-fdbc" name="Sultanate" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -10358,19 +10054,11 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3709-80e4-4df0-2f1f" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d815-e092-9379-b0ac" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="5bd1-c955-c111-01f8" name="Torpedo Salvo " hidden="false" collective="false" import="true" targetId="8ef1-9bd8-9674-29cd" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cc87-11d6-a851-df1d" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0c4a-2bfe-2ccf-b358" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -10385,12 +10073,13 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="e494-78a3-0496-174f" name="Lesath" hidden="false" targetId="d59c-0b45-6dbf-b74e" type="profile"/>
-        <infoLink id="27ed-388d-0447-29ef" name="Agile*" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="9c7b-e80a-d7d8-f2aa" name="Armoured Decking*" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="74f0-d0aa-d5c2-2fd9" name="Cor Caroli*" hidden="false" targetId="f151-e7cf-bb48-e823" type="rule"/>
-        <infoLink id="c060-1484-9411-df85" name="Elite Crew**" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
-        <infoLink id="955e-d121-0d62-da48" name="Powerslide*" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="c726-0a06-e2fe-d57e" name="Portal Focus**" hidden="false" targetId="9702-61f2-9adf-2829" type="rule"/>
+        <infoLink id="27ed-388d-0447-29ef" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="9c7b-e80a-d7d8-f2aa" name="Armoured Decking (3.04)" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
+        <infoLink id="74f0-d0aa-d5c2-2fd9" name="Cor Caroli (3.04)" hidden="false" targetId="f151-e7cf-bb48-e823" type="rule"/>
+        <infoLink id="c060-1484-9411-df85" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
+        <infoLink id="955e-d121-0d62-da48" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="c726-0a06-e2fe-d57e" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="714b-51f6-0147-c8f9" name="Portal Focus (3.04)" hidden="false" targetId="9702-61f2-9adf-2829" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="ab6e-e400-d987-eada" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -10401,32 +10090,20 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a881-beb6-b2b2-49bb" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a1fd-aba3-f429-ef90" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="c22c-4786-d1e7-c3eb" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="424e-477a-6179-e3a3" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1105-0698-a2ff-3476" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="161b-1512-8569-929e" name="Twin Judgement Lances" hidden="false" collective="false" import="true" targetId="94b7-397b-6a37-5302" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7f2f-85ee-95d7-d981" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f14a-9835-7de0-ba83" type="min"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="155.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="135.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -10443,14 +10120,15 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <modifier type="set" field="4c54-804a-8993-7325" value="13/13"/>
           </modifiers>
         </infoLink>
-        <infoLink id="ce92-d2d8-7d5c-e4c4" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="e446-36d8-df9d-72bd" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="7c4c-abd2-5202-ddb0" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="2ade-9492-e10e-16f7" name="Maritime Patrol**" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
-        <infoLink id="9d9f-f4e1-4751-4bec" name="Gun Runner**" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
-        <infoLink id="63c0-d41f-0904-fb4d" name="Heavy Firepower**" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="f8f5-aef4-3651-2741" name="Focused Gunnery**" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
-        <infoLink id="c10f-9340-463f-5a87" name="Portal Focus**" hidden="false" targetId="9702-61f2-9adf-2829" type="rule"/>
+        <infoLink id="ce92-d2d8-7d5c-e4c4" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="e446-36d8-df9d-72bd" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="7c4c-abd2-5202-ddb0" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="2ade-9492-e10e-16f7" name="Maritime Patrol (3.04)" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
+        <infoLink id="9d9f-f4e1-4751-4bec" name="Gun Runner (3.04)" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
+        <infoLink id="63c0-d41f-0904-fb4d" name="Heavy Firepower (3.04)" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="f8f5-aef4-3651-2741" name="Focused Gunnery (3.04)" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
+        <infoLink id="c10f-9340-463f-5a87" name="Portal Focus (3.04)" hidden="false" targetId="9702-61f2-9adf-2829" type="rule"/>
+        <infoLink id="28da-99c0-c5e1-c688" name="Disciplined (3.04)" hidden="false" targetId="ecf0-d255-3339-4a1b" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="9da0-1a2c-97a1-b497" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -10462,19 +10140,11 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6c9b-2e24-df6a-4cf2" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d364-407f-ac41-3084" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="43d3-3bf2-eb83-1594" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="025d-7612-9a60-00f4" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="55f7-9ee5-2191-daa0" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="1b2b-4d33-a229-7873" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
           <modifiers>
@@ -10489,26 +10159,13 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b26e-0d25-4d61-cff9" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f869-5b05-3a57-a8e9" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="e318-a729-1ba5-f784" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3f18-33a4-5536-46ed" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1575-ac34-2a4e-7755" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="fcfd-c239-c53e-7691" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c8df-2943-7324-1964" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cd3a-267c-0e42-2228" type="max"/>
-          </constraints>
         </entryLink>
+        <entryLink id="fcfd-c239-c53e-7691" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry"/>
       </entryLinks>
       <costs>
         <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="255.0"/>
@@ -10527,15 +10184,15 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <modifier type="set" field="name" value="Valide Kosem"/>
           </modifiers>
         </infoLink>
-        <infoLink id="0ff4-7916-e809-daba" name="Agile**" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
-        <infoLink id="d321-5c57-9383-858a" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="e0ba-5f9b-13f2-76c3" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="8a15-03c2-2541-409d" name="Maritime Patrol**" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
-        <infoLink id="d3f9-c822-1f94-e89b" name="Gun Runner**" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
-        <infoLink id="5e54-595d-5aa4-6a9e" name="Heavy Firepower**" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="e1a8-2b02-ff18-9e29" name="Focused Gunnery**" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
-        <infoLink id="f1c7-7fe1-7b90-3a79" name="Sharpshooter*" hidden="false" targetId="2c93-befd-f88b-0881" type="rule"/>
-        <infoLink id="4d2f-1513-0738-fd8f" name="Fortunes of War**" hidden="false" targetId="949d-d37f-c7c8-1093" type="rule"/>
+        <infoLink id="0ff4-7916-e809-daba" name="Agile (3.04)" hidden="false" targetId="93e6-1c0e-ac6b-0fc8" type="rule"/>
+        <infoLink id="d321-5c57-9383-858a" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="e0ba-5f9b-13f2-76c3" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="8a15-03c2-2541-409d" name="Maritime Patrol (3.04)" hidden="false" targetId="0b7c-6003-8433-2817" type="rule"/>
+        <infoLink id="d3f9-c822-1f94-e89b" name="Gun Runner (3.04)" hidden="false" targetId="9f05-9e27-c658-e49f" type="rule"/>
+        <infoLink id="5e54-595d-5aa4-6a9e" name="Heavy Firepower (3.04)" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="e1a8-2b02-ff18-9e29" name="Focused Gunnery (3.04)" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
+        <infoLink id="f1c7-7fe1-7b90-3a79" name="Sharpshooter (3.04)" hidden="false" targetId="2c93-befd-f88b-0881" type="rule"/>
+        <infoLink id="4d2f-1513-0738-fd8f" name="Fortunes of War (3.04)" hidden="false" targetId="949d-d37f-c7c8-1093" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="021e-e5e0-9200-0ee1" name="Sultanate�" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -10543,25 +10200,17 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <categoryLink id="9931-61f1-fb7b-6b44" name="Unique" hidden="false" targetId="293e-b55a-bcfa-95c3" primary="false"/>
       </categoryLinks>
       <entryLinks>
-        <entryLink id="0045-67d8-a7da-8e60" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="110e-749a-0199-27be" type="selectionEntry">
+        <entryLink id="0045-67d8-a7da-8e60" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="80d0-4b82-0e6b-361f" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7adc-e17d-e06f-d02d" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="b46f-7d87-323b-c9e6" name="Heavy Torpedo Salvo " hidden="false" collective="false" import="true" targetId="18e7-2755-41be-00c0" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="dbb4-72d5-bceb-70b3"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e16b-09e8-15ee-9bc1" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a8f6-2120-da10-0ba1" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="73d5-d8e9-976e-de51" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+        <entryLink id="73d5-d8e9-976e-de51" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
@@ -10570,25 +10219,17 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="41cc-4bfd-5ab5-1229" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="d7d4-e8a4-79d7-289e" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+        <entryLink id="d7d4-e8a4-79d7-289e" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8f4e-0310-220d-d665" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f6ae-6695-9b10-0e8e" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="d885-3b0b-2e70-7349" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+        <entryLink id="d885-3b0b-2e70-7349" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8452-f240-47f0-af21" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="61dc-40b5-2d95-384f" type="max"/>
-          </constraints>
         </entryLink>
-        <entryLink id="1bb9-b340-f947-ec28" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="90c9-59e3-935f-7a20" type="selectionEntry">
+        <entryLink id="1bb9-b340-f947-ec28" name="Heavy Gun Battery" hidden="false" collective="false" import="true" targetId="e8d5-6319-67ea-821d" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
@@ -10609,17 +10250,17 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="123c-531e-97b5-f2fd" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="ed30-7c43-79d2-3095" name="Advanced Repair Facilities**" hidden="false" targetId="6381-3c0e-84c8-6b3b" type="rule">
+        <infoLink id="ed30-7c43-79d2-3095" name="Advanced Repair Facilities (3.04)" hidden="false" targetId="6381-3c0e-84c8-6b3b" type="rule">
           <modifiers>
             <modifier type="append" field="name" value="(2)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="c541-324e-5816-4471" name="Armoured Decking**" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="022c-e373-2410-cd87" name="Heavy Firepower**" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="2c4f-4b73-eb6a-c0cc" name="Large Target�" hidden="false" targetId="5b16-04f1-a7a8-d2e0" type="rule"/>
-        <infoLink id="1150-650a-c3bd-9259" name="Priority Signals**" hidden="false" targetId="4106-315d-4d5c-9e8f" type="rule"/>
+        <infoLink id="c541-324e-5816-4471" name="Armoured Decking (3.04)" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
+        <infoLink id="022c-e373-2410-cd87" name="Heavy Firepower (3.04)" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="2c4f-4b73-eb6a-c0cc" name="Large Target (3.04)" hidden="false" targetId="5b16-04f1-a7a8-d2e0" type="rule"/>
+        <infoLink id="1150-650a-c3bd-9259" name="Priority Signals (3.04)" hidden="false" targetId="4106-315d-4d5c-9e8f" type="rule"/>
         <infoLink id="db56-5094-d9d0-e1dd" name="Tanis" hidden="false" targetId="18bc-c83d-7047-92b0" type="profile"/>
-        <infoLink id="60b7-69c6-d093-3435" name="Khepri Portal Strike**" hidden="false" targetId="ef6d-9cb4-5273-88bb" type="rule"/>
+        <infoLink id="60b7-69c6-d093-3435" name="Khepri Portal Strike (3.04)" hidden="false" targetId="ef6d-9cb4-5273-88bb" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="5af3-47e1-e0da-0a5c" name="New CategoryLink" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -10863,26 +10504,12 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="19bb-af37-ef82-9e43" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3f5b-b452-c62b-7b6e" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3528-c6f8-780b-94e9" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="fba8-efaa-5c26-3137" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="f4b9-eb5e-9f04-74b1" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="7273-f883-cc84-ffdd" type="max"/>
-          </constraints>
-        </entryLink>
+        <entryLink id="19bb-af37-ef82-9e43" name="Portal generator" hidden="false" collective="false" import="true" targetId="9827-2131-2316-f0ea" type="selectionEntry"/>
+        <entryLink id="fba8-efaa-5c26-3137" name="Shield generator" hidden="false" collective="false" import="true" targetId="0e7f-6ae4-f9b6-0ea1" type="selectionEntry"/>
         <entryLink id="82d1-df39-dc86-f48b" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="902e-6f27-6b6f-0f14" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d35b-32ce-d723-d4e0" type="max"/>
-          </constraints>
         </entryLink>
       </entryLinks>
       <costs>
@@ -10896,10 +10523,10 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="76c6-b368-7fa2-b729" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="e0bd-f28c-60d4-8713" name="Armoured Decking**" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
-        <infoLink id="4d61-2fa8-8d21-1988" name="Heavy Firepower**" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="6adb-aad2-d0ab-5657" name="Large Target**" hidden="false" targetId="5b16-04f1-a7a8-d2e0" type="rule"/>
-        <infoLink id="83bb-10a9-43a4-ade8" name="Priority Signals**" hidden="false" targetId="4106-315d-4d5c-9e8f" type="rule"/>
+        <infoLink id="e0bd-f28c-60d4-8713" name="Armoured Decking (3.04)" hidden="false" targetId="d894-52c8-4b18-f9f5" type="rule"/>
+        <infoLink id="4d61-2fa8-8d21-1988" name="Heavy Firepower (3.04)" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="6adb-aad2-d0ab-5657" name="Large Target (3.04)" hidden="false" targetId="5b16-04f1-a7a8-d2e0" type="rule"/>
+        <infoLink id="83bb-10a9-43a4-ade8" name="Priority Signals (3.04)" hidden="false" targetId="4106-315d-4d5c-9e8f" type="rule"/>
         <infoLink id="276f-8286-e7fa-f57b" name="Pharos" hidden="false" targetId="7888-85ab-462d-8ba1" type="profile"/>
       </infoLinks>
       <categoryLinks>
@@ -11017,26 +10644,10 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         </selectionEntryGroup>
       </selectionEntryGroups>
       <entryLinks>
-        <entryLink id="0e4a-96b4-81f4-e767" name="Portal generator" hidden="false" collective="false" import="true" targetId="74b0-d10f-4a04-5321" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9f82-7564-9827-f8d0" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="bfba-596f-9d13-3a8f" type="max"/>
-          </constraints>
-        </entryLink>
-        <entryLink id="9794-2cdb-547b-ec38" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="17b8-099d-3c1a-c74c" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2fed-6e07-2895-7227" type="max"/>
-          </constraints>
-        </entryLink>
         <entryLink id="2fef-78bb-cd10-69a0" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0997-9c6b-0675-7f8a" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5959-8873-f70b-e653" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="31df-76e5-d224-57b1" name="Heavy Particle Cannon" hidden="false" collective="false" import="true" targetId="fa1b-fa45-a389-af24" type="selectionEntry">
           <modifiers>
@@ -11117,15 +10728,41 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="c535-e9e3-810f-0059" name="Lyceum" hidden="false" targetId="6de4-5b43-0788-b170" type="profile"/>
-        <infoLink id="0d7e-d606-ef6e-dc0c" name="Flak Barrage**" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
+        <infoLink id="0d7e-d606-ef6e-dc0c" name="Flak Barrage (3.04)" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
             <modifier type="append" field="name" value=" (6)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="f404-4444-61fc-8257" name="Focused Gunnery**" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
-        <infoLink id="885e-0471-ee32-e714" name="Heavy Firepower**" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="f6cb-ed34-b951-d366" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="f404-4444-61fc-8257" name="Focused Gunnery (3.04)" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
+        <infoLink id="885e-0471-ee32-e714" name="Heavy Firepower (3.04)" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="f6cb-ed34-b951-d366" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
         <infoLink id="a543-460a-d61c-cb7f" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="dd5d-b8f5-40e2-b932" name="Luminiferous Defences (3.04)" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule">
+          <modifiers>
+            <modifier type="set" field="hidden" value="true">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="notInstanceOf"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+        </infoLink>
+        <infoLink id="5663-1847-7e96-06df" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule">
+          <modifiers>
+            <modifier type="set" field="hidden" value="true">
+              <conditionGroups>
+                <conditionGroup type="or">
+                  <conditions>
+                    <condition field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" childId="05bf-6a5e-ead2-512c" type="notInstanceOf"/>
+                  </conditions>
+                </conditionGroup>
+              </conditionGroups>
+            </modifier>
+          </modifiers>
+        </infoLink>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="d2c0-b463-b36b-dd1f" name="New CategoryLink" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -11311,19 +10948,19 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
             <modifier type="set" field="name" value="Badroulbadour"/>
           </modifiers>
         </infoLink>
-        <infoLink id="1579-085d-e9bf-b70d" name="Flak Barrage**" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
+        <infoLink id="1579-085d-e9bf-b70d" name="Flak Barrage (3.04)" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
             <modifier type="append" field="name" value=" (6)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="adf1-b95e-dade-ebe6" name="Devil’s Own Luck**" hidden="false" targetId="da8d-c041-fd15-a8de" type="rule"/>
-        <infoLink id="ebb9-8a99-6da2-0a50" name="Heavy Firepower**" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="4bb3-e662-a334-e4a7" name="Orichalcite Construction**" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
-        <infoLink id="10fc-93d0-1c72-8eb2" name="Powerslide**" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
-        <infoLink id="1316-503d-43d4-bc07" name="Elite Crew**" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
-        <infoLink id="66b9-4d6f-c670-72c8" name="Focused Gunnery**" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
-        <infoLink id="feab-e77f-12fb-c114" name="Inspirational**" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
-        <infoLink id="27b1-f3b9-a4a8-6534" name="Luminiferous Defences**" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="adf1-b95e-dade-ebe6" name="Devil’s Own Luck (3.04)" hidden="false" targetId="da8d-c041-fd15-a8de" type="rule"/>
+        <infoLink id="ebb9-8a99-6da2-0a50" name="Heavy Firepower (3.04)" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="4bb3-e662-a334-e4a7" name="Orichalcite Construction (3.04)" hidden="false" targetId="797a-6783-86f3-738a" type="rule"/>
+        <infoLink id="10fc-93d0-1c72-8eb2" name="Powerslide (3.04)" hidden="false" targetId="cd09-dbc0-dee4-b921" type="rule"/>
+        <infoLink id="1316-503d-43d4-bc07" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
+        <infoLink id="66b9-4d6f-c670-72c8" name="Focused Gunnery (3.04)" hidden="false" targetId="9ec9-dd04-5a42-6864" type="rule"/>
+        <infoLink id="feab-e77f-12fb-c114" name="Inspirational (3.04)" hidden="false" targetId="b48d-b4e0-19e8-d85a" type="rule"/>
+        <infoLink id="27b1-f3b9-a4a8-6534" name="Luminiferous Defences (3.04)" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="ec62-a8dc-92d8-7a82" name="New CategoryLink" hidden="false" targetId="9c13-9a46-5ee3-4981" primary="true"/>
@@ -11334,64 +10971,36 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="524e-7d62-2348-2576" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9fdf-f2c4-8f20-8580" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="555c-962f-54c6-231d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5999-93f9-20ed-15a9" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ccb4-78de-bdd0-4bf6" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="722a-84d0-2cda-4d2d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2615-8a8c-39f0-35f5" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4ba4-2717-7858-9a1e" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="ce57-a901-7475-53dc" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0863-15da-e61d-3986" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e3a8-f03e-7424-803a" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="a93f-4b14-767d-2ed0" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d318-3322-5fb9-4755" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8cbb-e6d4-8cb3-306d" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="7105-d9fd-183b-c94d" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1c3c-47ef-9cb9-752b" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d117-8652-1d7b-33e7" type="min"/>
-          </constraints>
         </entryLink>
         <entryLink id="3da8-5696-70a8-97cd" name="Heavy Broadside" hidden="false" collective="false" import="true" targetId="9985-b088-fda6-36d4" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="27c7-6494-d18b-0d70"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3fcc-cf3b-b039-81d5" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d107-d94c-67bc-18dd" type="max"/>
-          </constraints>
         </entryLink>
         <entryLink id="44c1-a618-4cc3-6370" name="Callimachus Chrono-Lathe" hidden="false" collective="false" import="true" targetId="b0bc-1862-f599-bed6" type="selectionEntry">
           <constraints>
@@ -11403,10 +11012,6 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="c93d-a414-b1bc-7d2c"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9bee-e8bd-d0bf-1e54" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4f68-0eee-775a-8a42" type="max"/>
-          </constraints>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7.0"/>
           </costs>
@@ -11415,10 +11020,6 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
           <modifiers>
             <modifier type="add" field="category" value="ce6f-067d-9ad4-ddaa"/>
           </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="df5f-beec-98bb-22c9" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ed1b-1210-0ff4-87c5" type="max"/>
-          </constraints>
           <costs>
             <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7.0"/>
           </costs>
@@ -11436,16 +11037,17 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="5c59-fecd-3ccf-c8ef" name="Lotan" hidden="false" targetId="13a3-0739-e1f4-6099" type="profile"/>
-        <infoLink id="2515-6bc9-7a5c-ac95" name="Amphibious�" hidden="false" targetId="1d20-a887-16ac-7f4c" type="rule"/>
+        <infoLink id="2515-6bc9-7a5c-ac95" name="Amphibious (3.04)" hidden="false" targetId="1d20-a887-16ac-7f4c" type="rule"/>
         <infoLink id="0cc7-1e26-5917-130f" name="Submarauder�" hidden="false" targetId="481e-dcda-510f-f32d" type="rule"/>
         <infoLink id="ec48-3cac-c8f8-dc3b" name="Mechanical Soul�" hidden="false" targetId="a278-bd16-046d-acb6" type="rule"/>
-        <infoLink id="67b6-d33a-b367-3695" name="Colossus�" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
-        <infoLink id="48dc-a562-e66c-3574" name="Enlightened Science�" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="4fbc-473d-fffa-2a7d" name="Luminiferous Defences�" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
-        <infoLink id="3116-05ad-4555-78c0" name="Apocalypse Protocol�" hidden="false" targetId="902a-02ab-5754-084d" type="rule"/>
+        <infoLink id="67b6-d33a-b367-3695" name="Colossus (3.04)" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
+        <infoLink id="48dc-a562-e66c-3574" name="Enlightened Science (3.04)" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
+        <infoLink id="4fbc-473d-fffa-2a7d" name="Luminiferous Defences (3.04)" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="3116-05ad-4555-78c0" name="Apocalypse Protocol (3.04)" hidden="false" targetId="902a-02ab-5754-084d" type="rule"/>
         <infoLink id="02db-afb1-91cc-cb30" name="Nemesis Protocol�" hidden="false" targetId="958a-c386-b88c-bdfe" type="rule"/>
         <infoLink id="6b58-9bdd-7c51-adde" name="Turbo Encabulation Drive�" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
         <infoLink id="867f-2767-5196-fa39" name="Scything Strike�" hidden="false" targetId="d2f1-7efd-6678-9003" type="rule"/>
+        <infoLink id="da27-abb2-3be7-775b" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="99df-aa27-bb07-410d" name="Myriapoda Colossus" hidden="false" targetId="df88-9193-acdf-316b" primary="false"/>
@@ -11478,7 +11080,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="146.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="136.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -11550,16 +11152,17 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       </constraints>
       <infoLinks>
         <infoLink id="17ec-c9a9-63f1-1d58" name="Ketos" hidden="false" targetId="c010-2e6e-9ff2-51f2" type="profile"/>
-        <infoLink id="15c3-79d7-4841-9836" name="Mechanical Soul�" hidden="false" targetId="a278-bd16-046d-acb6" type="rule"/>
-        <infoLink id="2c8f-9994-f778-27f9" name="Submarauder�" hidden="false" targetId="481e-dcda-510f-f32d" type="rule"/>
-        <infoLink id="f672-fe0d-1899-28f8" name="Turbo Encabulation Drive�" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
-        <infoLink id="1a0b-a203-d45d-b410" name="Mine Layer�" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
-        <infoLink id="728d-502b-6f51-7524" name="Agitation Harmoniser*" hidden="false" targetId="53ad-7286-fd8e-bea9" type="rule"/>
-        <infoLink id="2c19-ed09-3b17-fa58" name="Apocalypse Protocol�" hidden="false" targetId="902a-02ab-5754-084d" type="rule"/>
-        <infoLink id="cd78-e160-3951-8406" name="Colossus�" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
-        <infoLink id="c6fb-916c-c7e8-3690" name="Enlightened Science�" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
-        <infoLink id="588f-d31b-a8c2-8b07" name="Luminiferous Defences�" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
-        <infoLink id="579e-5e7c-9248-3bc5" name="Amphibious�" hidden="false" targetId="1d20-a887-16ac-7f4c" type="rule"/>
+        <infoLink id="15c3-79d7-4841-9836" name="Mechanical Soul (3.04)" hidden="false" targetId="a278-bd16-046d-acb6" type="rule"/>
+        <infoLink id="2c8f-9994-f778-27f9" name="Submarauder (3.04)" hidden="false" targetId="481e-dcda-510f-f32d" type="rule"/>
+        <infoLink id="f672-fe0d-1899-28f8" name="Turbo Encabulation Drive (3.04)" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
+        <infoLink id="1a0b-a203-d45d-b410" name="Mine Layer (3.04)" hidden="false" targetId="940f-44f3-71bf-f26c" type="rule"/>
+        <infoLink id="728d-502b-6f51-7524" name="Agitation Harmoniser (3.04)" hidden="false" targetId="53ad-7286-fd8e-bea9" type="rule"/>
+        <infoLink id="2c19-ed09-3b17-fa58" name="Apocalypse Protocol (3.04)" hidden="false" targetId="902a-02ab-5754-084d" type="rule"/>
+        <infoLink id="cd78-e160-3951-8406" name="Colossus (3.04)" hidden="false" targetId="f9be-f519-a9c2-f311" type="rule"/>
+        <infoLink id="c6fb-916c-c7e8-3690" name="Enlightened Science (3.04)" hidden="false" targetId="95d3-c242-ee78-9b3b" type="rule"/>
+        <infoLink id="588f-d31b-a8c2-8b07" name="Luminiferous Defences (3.04)" hidden="false" targetId="5a79-12a4-77b3-9619" type="rule"/>
+        <infoLink id="579e-5e7c-9248-3bc5" name="Amphibious (3.04)" hidden="false" targetId="1d20-a887-16ac-7f4c" type="rule"/>
+        <infoLink id="1d23-20da-8ae2-f3c0" name="Elite Crew (3.04)" hidden="false" targetId="4f7a-f51a-a60e-e6ba" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="0e6f-49dd-9a97-d577" name="Myriapoda Colossus" hidden="false" targetId="df88-9193-acdf-316b" primary="false"/>
@@ -11591,21 +11194,22 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="144.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="138.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
     <selectionEntry id="17b4-1966-685f-3f8e" name="Praxilla" publicationId="908d-6feb-2e9e-843b" hidden="false" collective="false" import="true" type="model">
       <constraints>
         <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3f27-d16d-b246-a857" type="min"/>
-        <constraint field="selections" scope="parent" value="6.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="06cc-78b0-c92c-9b7e" type="max"/>
+        <constraint field="selections" scope="parent" value="5.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="06cc-78b0-c92c-9b7e" type="max"/>
       </constraints>
       <infoLinks>
         <infoLink id="ef25-a3c2-63fb-6a16" name="Terror From Belove�" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="405a-6e4d-45ad-b188" type="rule"/>
-        <infoLink id="0726-28f1-e901-0e3b" name="Hammer Sweep�" publicationId="908d-6feb-2e9e-843b" hidden="false" targetId="4a79-7f9b-ba17-59b8" type="rule"/>
+        <infoLink id="0726-28f1-e901-0e3b" name="Hammer Sweep (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false" targetId="4a79-7f9b-ba17-59b8" type="rule"/>
         <infoLink id="e948-5d18-fb35-d32c" name="Praxilla" hidden="false" targetId="b9ae-2c38-9920-a0bd" type="profile"/>
-        <infoLink id="6120-00b4-fc7b-a58e" name="Mechanical Soul�" publicationId="908d-6feb-2e9e-843b" hidden="false" targetId="a278-bd16-046d-acb6" type="rule"/>
-        <infoLink id="1b1b-b1da-9304-51d4" name="Turbo Encabulation Drive�" publicationId="908d-6feb-2e9e-843b" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
+        <infoLink id="6120-00b4-fc7b-a58e" name="Mechanical Soul (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false" targetId="a278-bd16-046d-acb6" type="rule"/>
+        <infoLink id="1b1b-b1da-9304-51d4" name="Linear Dash (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false" targetId="db6c-61a0-22a6-0d7a" type="rule"/>
+        <infoLink id="54a2-4d2a-f642-06c0" name="Turbo Encabulation Drive (3.04)" publicationId="908d-6feb-2e9e-843b" hidden="false" targetId="4fdd-a708-f940-e052" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="66ab-b269-bf4f-700a" name="Automata" hidden="false" targetId="f143-0c0d-137b-1745" primary="false"/>
@@ -11778,7 +11382,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">4/4</characteristic>
         <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">4/4</characteristic>
         <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">3/2</characteristic>
-        <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">8/7</characteristic>
+        <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">7/7</characteristic>
         <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">15/14</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/3</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">5/3</characteristic>
@@ -11965,7 +11569,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/3</characteristic>
         <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">5/3</characteristic>
         <characteristic name="Fray" typeId="4c54-804a-8993-7325">12/11</characteristic>
-        <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">8/6</characteristic>
+        <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">8/8</characteristic>
       </characteristics>
     </profile>
     <profile id="2913-8bc9-b9fd-9ec8" name="Topkapi" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model    ">
@@ -12010,8 +11614,8 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
     <profile id="e2f9-31d5-8cdf-e688" name="Khoms" hidden="false" typeId="4cb0-515e-e6e0-153a" typeName="Standard Model    ">
       <characteristics>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">3/3</characteristic>
-        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">0</characteristic>
-        <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">0</characteristic>
+        <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">0/0</characteristic>
+        <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">0/0</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">5/5</characteristic>
         <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">12/10</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/4</characteristic>
@@ -12106,7 +11710,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">6/5</characteristic>
         <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">10/10</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/3</characteristic>
-        <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">0</characteristic>
+        <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">0/0</characteristic>
         <characteristic name="Fray" typeId="4c54-804a-8993-7325">7/6</characteristic>
         <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">4/2</characteristic>
       </characteristics>
@@ -12145,7 +11749,7 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">6/5</characteristic>
         <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">10/10</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">5/3</characteristic>
-        <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">0</characteristic>
+        <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">0/0</characteristic>
         <characteristic name="Fray" typeId="4c54-804a-8993-7325">7/6</characteristic>
         <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">4/2</characteristic>
       </characteristics>
@@ -12245,11 +11849,11 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       <characteristics>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">2/2</characteristic>
         <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">4/3</characteristic>
-        <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">0/0</characteristic>
+        <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">3/2</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">6/5</characteristic>
         <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">11/11</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">0/0</characteristic>
-        <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">0/0</characteristic>
+        <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">2/1</characteristic>
         <characteristic name="Fray" typeId="4c54-804a-8993-7325">7/5</characteristic>
         <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">4/3</characteristic>
       </characteristics>
@@ -12258,11 +11862,11 @@ Review 3.04.00: update to ORBAT 3.04 (date 2023-08-17)</readme>
       <characteristics>
         <characteristic name="Mass" typeId="dbde-866b-70b0-d5e9">2/2</characteristic>
         <characteristic name="Speed" typeId="9e4a-2ba1-f396-74b9">4/3</characteristic>
-        <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">0/0</characteristic>
+        <characteristic name="Turn Limit" typeId="b9f6-2f65-e8c8-b906">3/2</characteristic>
         <characteristic name="Armour" typeId="29a3-02bb-e7f3-0ddb">6/5</characteristic>
         <characteristic name="Citadel" typeId="c141-3bcf-41f5-6c24">11/11</characteristic>
         <characteristic name="ADV" typeId="6428-9828-bb2e-f923">0/0</characteristic>
-        <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">0/0</characteristic>
+        <characteristic name="SDV" typeId="b001-8ebf-b7fe-74da">2/1</characteristic>
         <characteristic name="Fray" typeId="4c54-804a-8993-7325">7/5</characteristic>
         <characteristic name="Hull" typeId="ff43-364b-8da9-bce9">4/3</characteristic>
       </characteristics>
diff --git a/Union.cat b/Union.cat
index 987bee3..75ccb7b 100644
--- a/Union.cat
+++ b/Union.cat
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="caf4-134c-500d-0cd9" name="Union v3.04" revision="5" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
-  <comment>Union ORBAT 3.04 (published 17/08/2023)</comment>
+<catalogue id="caf4-134c-500d-0cd9" name="Union v3.04" revision="6" battleScribeVersion="2.03" authorName="Riccardo Sipone" authorContact="siponeric@hotmail.com" library="false" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+  <comment>Union ORBAT 3.04 (published 01/09/2023)</comment>
   <readme>Review 1.03.00: Initial release
 Review 3.03.00: Update to Orbat 3.03
 Review 3.03.01: correction after the update to Orbat 3.03
 Review 3.03.02: 2nd correction wave after the update to Orbat 3.03 (2023-02-05)
 Review 3.04.00: Update to Orbat 3.04 (rev.1)
+Review 3.04.01: complete uodate for Orbat 3.04 (published 20230901)
 </readme>
   <categoryEntries>
     <categoryEntry id="44e3-4b42-5468-18b4" name="Union" publicationId="e6a1-85d3-8979-7880" hidden="false"/>
@@ -75,11 +76,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
         </infoLink>
       </infoLinks>
       <categoryLinks>
-        <categoryLink id="fb5d-9525-9bc2-5c4d" name="Patron" hidden="false" targetId="d6e0-2055-9c1b-5e86" primary="false">
-          <constraints>
-            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="421b-20a1-23d8-8863" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="32f7-a927-97cf-9619" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="21cd-2abf-bd21-c2e6" type="min"/>
@@ -298,11 +294,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
         <infoLink id="72cd-72c6-771f-3bcd" name="Valorous Conduct" hidden="false" targetId="0d1b-0810-3b49-e25e" type="rule"/>
       </infoLinks>
       <categoryLinks>
-        <categoryLink id="fb5d-9525-9bc2-5c4d" name="Patron" hidden="false" targetId="d6e0-2055-9c1b-5e86" primary="false">
-          <constraints>
-            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="421b-20a1-23d8-8863" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="5ac5-bd66-0dfc-df29" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="82a4-db59-326d-aa9e" type="min"/>
@@ -491,11 +482,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
         <infoLink id="5056-f26a-ae15-981a" name="Command Override**" hidden="false" targetId="78c8-6a85-daa7-3625" type="rule"/>
       </infoLinks>
       <categoryLinks>
-        <categoryLink id="fb5d-9525-9bc2-5c4d" name="Patron" hidden="false" targetId="d6e0-2055-9c1b-5e86" primary="false">
-          <constraints>
-            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="421b-20a1-23d8-8863" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="8b41-e345-6526-d9e7" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="dd52-f3f9-9b00-06a4" type="min"/>
@@ -682,11 +668,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
         <infoLink id="a3f2-8556-067a-96d4" name="Talon Assault*" hidden="false" targetId="77fc-8a38-b1e1-b921" type="rule"/>
       </infoLinks>
       <categoryLinks>
-        <categoryLink id="fb5d-9525-9bc2-5c4d" name="Patron" hidden="false" targetId="d6e0-2055-9c1b-5e86" primary="false">
-          <constraints>
-            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="421b-20a1-23d8-8863" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="32f7-a927-97cf-9619" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="21cd-2abf-bd21-c2e6" type="min"/>
@@ -875,11 +856,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
         <infoLink id="3a91-8113-f853-cb12" name="Talon Assault*" hidden="false" targetId="77fc-8a38-b1e1-b921" type="rule"/>
       </infoLinks>
       <categoryLinks>
-        <categoryLink id="fb5d-9525-9bc2-5c4d" name="Patron" hidden="false" targetId="d6e0-2055-9c1b-5e86" primary="false">
-          <constraints>
-            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="421b-20a1-23d8-8863" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="cf6c-a8b1-258f-3d2a" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="6106-d32c-a1ed-9f1d" type="min"/>
@@ -924,11 +900,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
         <infoLink id="e95f-a48e-cc59-63f7" name="Pipeworks Battlefleet Bonus�" hidden="false" targetId="5ac7-509a-c07e-293b" type="rule"/>
       </infoLinks>
       <categoryLinks>
-        <categoryLink id="fb5d-9525-9bc2-5c4d" name="Patron" hidden="false" targetId="d6e0-2055-9c1b-5e86" primary="false">
-          <constraints>
-            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="421b-20a1-23d8-8863" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="2898-c702-c960-3e9b" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="30b6-0f7c-4512-202d" type="min"/>
@@ -1124,11 +1095,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
     </forceEntry>
     <forceEntry id="9b71-85d4-ba13-9a8e" name="Honorable Eclipse Company&apos;s Battlefleet (WIP)" publicationId="e6a1-85d3-8979-7880" hidden="true">
       <categoryLinks>
-        <categoryLink id="a185-272c-47d9-9eac" name="Patron" hidden="false" targetId="d6e0-2055-9c1b-5e86" primary="false">
-          <constraints>
-            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" id="5c36-a0cf-6a4e-6aeb" type="max"/>
-          </constraints>
-        </categoryLink>
         <categoryLink id="43db-4d71-f0b5-71c3" name="Flagship" hidden="false" targetId="fef3-1842-580c-4bef" primary="false">
           <constraints>
             <constraint field="selections" scope="force" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="false" id="77df-3072-b730-08f6" type="min"/>
@@ -1149,6 +1115,19 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
         </categoryLink>
       </categoryLinks>
     </forceEntry>
+    <forceEntry id="0006-c538-027b-e3f4" name="- Union Force Patron" publicationId="d854-a2d6-3d52-44c4" hidden="false">
+      <constraints>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e688-427e-d5ea-ba69" type="min"/>
+        <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6a6b-2bc0-78e0-52c9" type="max"/>
+      </constraints>
+      <categoryLinks>
+        <categoryLink id="175b-f6f4-16c6-a64c" name="Patron" hidden="false" targetId="d6e0-2055-9c1b-5e86" primary="false">
+          <constraints>
+            <constraint field="selections" scope="roster" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d38c-6d70-b8f9-0564" type="min"/>
+          </constraints>
+        </categoryLink>
+      </categoryLinks>
+    </forceEntry>
   </forceEntries>
   <selectionEntries>
     <selectionEntry id="f896-e02e-67d1-bb19" name="Valiant Fast Destroyers Squadron" hidden="false" collective="false" import="true" type="unit">
@@ -5762,7 +5741,7 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
     <selectionEntry id="f306-184a-3ef7-a568" name="Abraham Linoln, Secret Service Director" publicationId="e6a1-85d3-8979-7880" hidden="false" collective="false" import="true" type="upgrade">
       <rules>
         <rule id="5c1b-01dc-114a-ee41" name="Abraham Linoln, Secret Service Director" publicationId="129d-da97-caec-1ddd" hidden="false">
-          <description>Increase your Victory &amp; Valour hand size for the Encounter by +1. Furthermore, once per Round you may discard your Victory and Valour hand and draw replacement cards at any time.</description>
+          <description>Increase your Victory &amp; Valour hand size for the Encounter by +1. Furthermore, once per Round you may discard your Victory and Valour hand and draw replacement cards at any time for those discarded.</description>
         </rule>
       </rules>
       <categoryLinks>
@@ -5790,7 +5769,7 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
     <selectionEntry id="e727-37e5-81f7-a456" name="Silas Hodge, Executive-General of the Honorable Eclipse" publicationId="e6a1-85d3-8979-7880" hidden="false" collective="false" import="true" type="upgrade">
       <rules>
         <rule id="1973-3d44-b178-8399" name="Silas Hodge, Executive-General of the Honorable Eclipse" publicationId="e6a1-85d3-8979-7880" hidden="false">
-          <description>Increase your Victory &amp; Valour hand size for the Encounter by +1. Furthermore, once per Round you may discard your Victory and Valour hand and draw replacement cards at any time.</description>
+          <description>There is no limit to the number of Honorable Eclipse Company Battlefleets included in a Force that has Executive-General Silas Hodge as its Patron. Furthermore, you are not required to take any other Battlefleets before taking an Honorable Eclipse Company Battlefleet.</description>
         </rule>
       </rules>
       <categoryLinks>
@@ -5904,16 +5883,52 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
           </costs>
         </selectionEntry>
       </selectionEntries>
-      <entryLinks>
-        <entryLink id="0a1f-004e-a908-e625" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
-          <modifiers>
-            <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
-          </modifiers>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="7cf1-370b-c672-c491" name="Secondary Weapon" hidden="false" collective="false" import="true">
           <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="04f2-2d2a-ebfb-e73b" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="fa4d-9be7-0494-ff90" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0a6d-7f97-bc31-4f46" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="03e7-d071-e139-b0ee" type="max"/>
           </constraints>
-        </entryLink>
+          <selectionEntryGroups>
+            <selectionEntryGroup id="2a10-3003-87cc-1856" name="Front First" hidden="false" collective="false" import="true" defaultSelectionEntryId="db7b-c542-5ab7-1159">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="24f3-5923-4700-840c" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5d21-f220-25db-ef48" type="max"/>
+              </constraints>
+              <entryLinks>
+                <entryLink id="90c6-cadb-ea95-f5c0" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="de4e-4c82-942d-afc0" type="max"/>
+                  </constraints>
+                </entryLink>
+                <entryLink id="8b5f-a3fb-7abd-4d34" name="Chesapeake Gatling Gun" hidden="false" collective="false" import="true" targetId="6a09-b3d9-f16a-c349" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="50d5-0e66-875c-caa5" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="db7b-c542-5ab7-1159" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c380-5278-f8ce-e1e1" type="max"/>
+                  </constraints>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+          </selectionEntryGroups>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
+      <entryLinks>
         <entryLink id="ccea-2de0-065d-b50a" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
@@ -6348,6 +6363,51 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
         <categoryLink id="7546-5155-9f26-2a4d" name="Missile Cruiser" hidden="false" targetId="6418-4b93-61d8-78b7" primary="false"/>
         <categoryLink id="1d0c-aaea-4903-d258" name="Union" hidden="false" targetId="44e3-4b42-5468-18b4" primary="true"/>
       </categoryLinks>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="18d6-5756-ab0e-accc" name="Secondary Weapon" hidden="false" collective="false" import="true">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e6ee-a4d5-e268-c3da" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="53cd-0bcd-64a0-01dc" type="max"/>
+          </constraints>
+          <selectionEntryGroups>
+            <selectionEntryGroup id="f4e4-fdea-8acb-12c2" name="Front First" hidden="false" collective="false" import="true" defaultSelectionEntryId="607b-4b47-4d07-8388">
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="2274-02d4-7a67-2801" type="min"/>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6b95-90d3-4aca-c250" type="max"/>
+              </constraints>
+              <entryLinks>
+                <entryLink id="d2bd-7b9b-5098-91d0" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1e0b-1280-9c3d-ed6e" type="max"/>
+                  </constraints>
+                </entryLink>
+                <entryLink id="1dcf-4052-d1a4-8fe8" name="Chesapeake Gatling Gun" hidden="false" collective="false" import="true" targetId="6a09-b3d9-f16a-c349" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9912-36fa-8ef0-02c3" type="max"/>
+                  </constraints>
+                  <costs>
+                    <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+                  </costs>
+                </entryLink>
+                <entryLink id="607b-4b47-4d07-8388" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+                  </modifiers>
+                  <constraints>
+                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3d2c-8aeb-626f-009a" type="max"/>
+                  </constraints>
+                </entryLink>
+              </entryLinks>
+            </selectionEntryGroup>
+          </selectionEntryGroups>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
       <entryLinks>
         <entryLink id="da23-0ba3-a0cd-7839" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
@@ -6358,15 +6418,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b882-c81a-f555-8599" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="9b89-99dd-1491-2c23" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
-          <modifiers>
-            <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b202-61c4-06c5-7c62" type="max"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8242-da06-d94a-1200" type="min"/>
-          </constraints>
-        </entryLink>
         <entryLink id="b544-ee94-599b-6330" name="Cruise Missile Silo" hidden="false" collective="false" import="true" targetId="edf5-5bd7-6619-2881" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="a4f6-2208-db34-4879"/>
@@ -6669,6 +6720,43 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
         <categoryLink id="015d-9749-584b-dec1" name="Paddlewheel" hidden="false" targetId="efd3-b9c9-b144-de57" primary="false"/>
         <categoryLink id="82b8-8031-e5c8-0237" name="Arc Cruiser" hidden="false" targetId="7db7-a182-45aa-0f1b" primary="false"/>
       </categoryLinks>
+      <selectionEntryGroups>
+        <selectionEntryGroup id="b8a6-aa9d-c4f1-4a9c" name="Main Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="2ef7-d888-5a88-6514">
+          <constraints>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="87db-565a-c6f3-c2c3" type="min"/>
+            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="94e1-2cee-b301-f672" type="max"/>
+          </constraints>
+          <entryLinks>
+            <entryLink id="c88f-1d8a-977c-d829" name="Gun Battery" hidden="false" collective="false" import="true" targetId="e32f-eb1d-5c03-b61c" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="9379-2e5f-5ee8-125f" type="max"/>
+              </constraints>
+            </entryLink>
+            <entryLink id="93ef-8def-4d6d-6f85" name="Chesapeake Gatling Gun" hidden="false" collective="false" import="true" targetId="6a09-b3d9-f16a-c349" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="84c1-d3b7-44f8-0076" type="max"/>
+              </constraints>
+              <costs>
+                <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="5.0"/>
+              </costs>
+            </entryLink>
+            <entryLink id="2ef7-d888-5a88-6514" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
+              <modifiers>
+                <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="27d5-45d8-9e8d-2f8a" type="max"/>
+              </constraints>
+            </entryLink>
+          </entryLinks>
+        </selectionEntryGroup>
+      </selectionEntryGroups>
       <entryLinks>
         <entryLink id="dccc-5f46-b6b3-6989" name="Arc generator" hidden="false" collective="false" import="true" targetId="63e4-54cd-2af6-ce6c" type="selectionEntry">
           <constraints>
@@ -6685,15 +6773,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2376-cc9a-9d53-5aa4" type="max"/>
           </constraints>
         </entryLink>
-        <entryLink id="576b-c8b2-3e69-414b" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
-          <modifiers>
-            <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
-          </modifiers>
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="87df-344c-adcb-11bf" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a9ea-9d5c-6292-35f7" type="max"/>
-          </constraints>
-        </entryLink>
         <entryLink id="8169-95bc-327b-f6e1" name="Broadside" hidden="false" collective="false" import="true" targetId="0600-8fa9-227d-91ba" type="selectionEntry">
           <modifiers>
             <modifier type="add" field="category" value="372f-19f1-09ed-e694"/>
@@ -7064,9 +7143,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="bbc5-0cd9-3508-8683" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2b42-6a9f-baad-13e7" type="max"/>
           </constraints>
-          <costs>
-            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7.0"/>
-          </costs>
         </entryLink>
       </entryLinks>
       <costs>
@@ -7814,9 +7890,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="42fe-7709-0f2f-97e7" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="881a-ae8f-86b7-ccac" type="max"/>
           </constraints>
-          <costs>
-            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
-          </costs>
         </entryLink>
         <entryLink id="6875-6194-d0b2-6327" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
           <modifiers>
@@ -7826,9 +7899,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="f25a-bdc6-b8fe-cde4" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0f24-1692-3fdf-b2cc" type="max"/>
           </constraints>
-          <costs>
-            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
-          </costs>
         </entryLink>
         <entryLink id="e87b-20ea-c9ed-037c" name="Freedom Incendiary Bombs" hidden="false" collective="false" import="true" targetId="ddf4-ca70-bed8-a446" type="selectionEntry">
           <modifiers>
@@ -7838,9 +7908,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9fde-4208-c95a-4018" type="min"/>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ba56-574b-c556-feb6" type="max"/>
           </constraints>
-          <costs>
-            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="3.0"/>
-          </costs>
         </entryLink>
       </entryLinks>
       <costs>
@@ -7889,7 +7956,7 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
     </selectionEntry>
     <selectionEntry id="4375-fc25-56d6-459a" name="Cheyenne" publicationId="e6a1-85d3-8979-7880" hidden="false" collective="false" import="true" type="model">
       <constraints>
-        <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="41e2-552d-13e6-e007" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="41e2-552d-13e6-e007" type="min"/>
         <constraint field="selections" scope="parent" value="5.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="7611-26cb-2692-09cb" type="max"/>
       </constraints>
       <infoLinks>
@@ -8089,7 +8156,7 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
         </entryLink>
       </entryLinks>
       <costs>
-        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="137.0"/>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="138.0"/>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
@@ -8563,9 +8630,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
           <constraints>
             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="19cc-bff1-c577-2484" type="max"/>
           </constraints>
-          <costs>
-            <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="7.0"/>
-          </costs>
         </entryLink>
       </entryLinks>
       <costs>
@@ -8794,7 +8858,7 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="92e1-0b2d-5719-0a7b" name="Rear" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="92e1-0b2d-5719-0a7b" name="Rear" hidden="false" collective="false" import="true" defaultSelectionEntryId="dc7d-55cf-370b-d87e">
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="07dc-3ecf-47b0-c99f" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0649-9a85-0486-6e57" type="max"/>
@@ -9355,7 +9419,7 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
                 <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="baf5-63fd-2a02-0bc0" type="max"/>
               </constraints>
               <entryLinks>
-                <entryLink id="7957-4536-cd3b-e51a" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+                <entryLink id="7957-4536-cd3b-e51a" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="db84-bb03-d026-c3a5"/>
                   </modifiers>
@@ -9402,7 +9466,7 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
                   </costs>
                 </entryLink>
-                <entryLink id="3c73-44ec-4243-ced3" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+                <entryLink id="3c73-44ec-4243-ced3" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="4e9e-7862-58ad-15e6"/>
                   </modifiers>
@@ -9433,7 +9497,7 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
                     <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="10.0"/>
                   </costs>
                 </entryLink>
-                <entryLink id="a688-533f-a94a-a563" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="1420-4e0a-ca1d-6cb7" type="selectionEntry">
+                <entryLink id="a688-533f-a94a-a563" name="Rocket Battery" hidden="false" collective="false" import="true" targetId="148c-d625-907c-1bf0" type="selectionEntry">
                   <modifiers>
                     <modifier type="add" field="category" value="5347-4855-4421-ed77"/>
                   </modifiers>
@@ -9915,7 +9979,7 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
             <constraint field="selections" scope="parent" value="3.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="ab29-8f75-7502-4b05" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="442a-5bee-574e-92dc" name="Front First" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="442a-5bee-574e-92dc" name="Front First" hidden="false" collective="false" import="true" defaultSelectionEntryId="e852-7272-7a32-2469">
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="c0f2-775d-0e88-8232" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e5d7-9984-374e-e03a" type="max"/>
@@ -10244,7 +10308,7 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
             <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="b860-4c01-5d20-3be6" type="max"/>
           </constraints>
           <selectionEntryGroups>
-            <selectionEntryGroup id="5323-934d-c337-952a" name="Front" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="5323-934d-c337-952a" name="Front" hidden="false" collective="false" import="true" defaultSelectionEntryId="6624-c57e-8917-85b9">
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="5b85-a1b7-0b08-2fcb" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1ca8-795e-2cff-6e7e" type="max"/>
@@ -10280,7 +10344,7 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
                 </entryLink>
               </entryLinks>
             </selectionEntryGroup>
-            <selectionEntryGroup id="e78d-b334-83e9-9186" name="Rear" hidden="false" collective="false" import="true">
+            <selectionEntryGroup id="e78d-b334-83e9-9186" name="Rear" hidden="false" collective="false" import="true" defaultSelectionEntryId="d030-d687-4c5b-a85f">
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="1cb0-005c-6355-d4a6" type="min"/>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="a4ad-8b28-98b6-8abf" type="max"/>
@@ -10530,20 +10594,20 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
       </constraints>
       <infoLinks>
         <infoLink id="cf71-747e-1a14-3060" name="Senator" hidden="false" targetId="d486-4529-82b8-245a" type="profile"/>
-        <infoLink id="a6dc-9ed1-70a3-8c00" name="Command Codes**" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="422e-0279-5ff5-c279" type="rule"/>
-        <infoLink id="cb1f-41ca-7180-c3e9" name="Contra Rotation**" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="177e-3490-5f5e-f4b9" type="rule"/>
-        <infoLink id="1ef2-d36b-c1ed-e3a1" name="Flak Barrage**" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
+        <infoLink id="a6dc-9ed1-70a3-8c00" name="Command Codes" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="422e-0279-5ff5-c279" type="rule"/>
+        <infoLink id="cb1f-41ca-7180-c3e9" name="Contra Rotation (3.04)" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="177e-3490-5f5e-f4b9" type="rule"/>
+        <infoLink id="1ef2-d36b-c1ed-e3a1" name="Flak Barrage (3.04)" hidden="false" targetId="7b67-714d-bb2b-6297" type="rule">
           <modifiers>
             <modifier type="append" field="name" value=" (6)"/>
           </modifiers>
         </infoLink>
-        <infoLink id="d636-4965-6a7d-0338" name="Flashlamps**" hidden="false" targetId="ee33-07eb-77e7-c5aa" type="rule"/>
-        <infoLink id="58c3-1906-c963-c244" name="Give Em Hell�" hidden="false" targetId="1181-0663-f1c1-9047" type="rule"/>
-        <infoLink id="a7f7-a3b0-af87-d8cd" name="Heavy Firepower**" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
-        <infoLink id="3daf-42be-f419-9453" name="Long Range Support**" hidden="false" targetId="b44f-ea85-bc94-f729" type="rule"/>
-        <infoLink id="4173-8162-6435-266d" name="Skyfire**" hidden="false" targetId="1083-2af1-7bfc-7a55" type="rule"/>
-        <infoLink id="4ba7-b782-377d-06eb" name="Tactical Cavitation�" hidden="false" targetId="e89c-d342-c776-60c3" type="rule"/>
-        <infoLink id="7347-de0d-c9b3-a0d3" name="Triangulated Solution�" hidden="false" targetId="8d45-38e1-cce2-fbf2" type="rule"/>
+        <infoLink id="d636-4965-6a7d-0338" name="Flashlamps (3.04)" hidden="false" targetId="ee33-07eb-77e7-c5aa" type="rule"/>
+        <infoLink id="58c3-1906-c963-c244" name="Give Em Hell (3.04)" hidden="false" targetId="1181-0663-f1c1-9047" type="rule"/>
+        <infoLink id="a7f7-a3b0-af87-d8cd" name="Heavy Firepower (3.04)" hidden="false" targetId="ecfb-a5b5-1cb8-8e39" type="rule"/>
+        <infoLink id="3daf-42be-f419-9453" name="Long Range Support (3.04)" hidden="false" targetId="b44f-ea85-bc94-f729" type="rule"/>
+        <infoLink id="4173-8162-6435-266d" name="Skyfire (3.04)" hidden="false" targetId="1083-2af1-7bfc-7a55" type="rule"/>
+        <infoLink id="4ba7-b782-377d-06eb" name="Tactical Cavitation" hidden="false" targetId="e89c-d342-c776-60c3" type="rule"/>
+        <infoLink id="7347-de0d-c9b3-a0d3" name="Triangulated Solution" hidden="false" targetId="8d45-38e1-cce2-fbf2" type="rule"/>
       </infoLinks>
       <categoryLinks>
         <categoryLink id="5332-36fc-a84a-c45a" name="New CategoryLink" hidden="false" targetId="44e3-4b42-5468-18b4" primary="true"/>
@@ -10632,31 +10696,6 @@ Review 3.04.00: Update to Orbat 3.04 (rev.1)
         <categoryLink id="017c-eb72-04b0-0bc7" name="Unique" hidden="false" targetId="293e-b55a-bcfa-95c3" primary="false"/>
         <categoryLink id="a6bc-f215-f19c-fed0" name="Paddlewheel" hidden="false" targetId="efd3-b9c9-b144-de57" primary="false"/>
       </categoryLinks>
-      <selectionEntryGroups>
-        <selectionEntryGroup id="79b8-8975-d48a-4c80" name="Secondary Weapon" hidden="false" collective="false" import="true" defaultSelectionEntryId="e642-3181-1d09-0b20">
-          <constraints>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="eb21-2465-ac28-a306" type="min"/>
-            <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2c15-b912-671d-2bec" type="max"/>
-          </constraints>
-          <entryLinks>
-            <entryLink id="e642-3181-1d09-0b20" name="Gun Battery" hidden="false" collective="false" import="true" targetId="bc09-4e9a-a2ad-3d68" type="selectionEntry">
-              <modifiers>
-                <modifier type="add" field="category" value="f2af-2773-24ff-2e12"/>
-                <modifier type="set" field="5b17-2ecb-fe62-872a" value="0.0">
-                  <conditions>
-                    <condition field="selections" scope="ancestor" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="2ec4-7593-57fc-8ecb" type="instanceOf"/>
-                  </conditions>
-                </modifier>
-              </modifiers>
-              <constraints>
-                <constraint field="selections" scope="parent" value="0.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cc12-fb42-60b4-f86d" type="min"/>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5b17-2ecb-fe62-872a" type="max"/>
-              </constraints>
-            </entryLink>
-            <entryLink id="d82a-5d2f-c640-2501" name="Hydrophone Relay" hidden="false" collective="false" import="true" targetId="97eb-34cf-e776-c21f" type="selectionEntry"/>
-          </entryLinks>
-        </selectionEntryGroup>
-      </selectionEntryGroups>
       <entryLinks>
         <entryLink id="34bf-223f-5bae-4575" name="Shield generator" hidden="false" collective="false" import="true" targetId="596e-bbf7-4be2-d494" type="selectionEntry">
           <constraints>
diff --git a/Weapon.cat b/Weapon.cat
index 26ee226..c3c50de 100644
--- a/Weapon.cat
+++ b/Weapon.cat
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="526f-06e7-edaa-02b8" name="Weapon" revision="15" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="526f-06e7-edaa-02b8" name="Weapon" revision="16" battleScribeVersion="2.03" authorName="Riccardo Sipone, TrikkStar" authorContact="siponeric@hotmail.com" library="true" gameSystemId="1242-c30b-419f-8229" gameSystemRevision="9" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <readme>Weapon collection
 Review v1: starting document
 Review v2: imprevment to follow ORBAT requirments
@@ -15,7 +15,8 @@ Review v11: new data for Mid April &apos;23 update
 Review v12: correction for end of April &apos;23 update
 Review v13: correction for end of May &apos;23 update
 Review v14: corrected gun battery profile for June &apos;23 update, review 3.04.04: new data for mid April updated
-Review v15: start of review for 3.04 Orbats (rev.4)</readme>
+Review v15: start of review for 3.04 Orbats (rev.4)
+Review v15: start of review for 3.04 Orbats for Sept &apos;23</readme>
   <categoryEntries>
     <categoryEntry id="dbb4-72d5-bceb-70b3" name="F" hidden="false"/>
     <categoryEntry id="372f-19f1-09ed-e694" name="P&amp;S" hidden="false"/>
@@ -128,6 +129,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="0600-8fa9-227d-91ba" name="Broadside" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="87fe-4534-d24f-35a5" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3d76-478b-b3a1-7185" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="fc42-5b89-f463-fc3b" name="Broadside" hidden="false" targetId="ae08-f907-00e0-6554" type="profile">
           <modifierGroups>
@@ -842,6 +847,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="fc11-e98a-2d7f-198c" name="Light Broadside" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8e27-2e8a-8b53-ecd8" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9c82-ed43-875f-8bc9" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="8b1f-e8dd-65be-0107" name="Light Broadside" hidden="false" targetId="c017-9b01-2262-f6e7" type="profile">
           <modifierGroups>
@@ -1195,6 +1204,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="3e85-ccc4-d939-f7f8" name="Heavy Flak Broadside" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="ea68-78bd-0e94-62d6" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a5ee-2899-2b7a-1c38" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="be48-5823-581b-a5c7" name="Heavy Flak Broadside" hidden="false" targetId="a4b7-fe9b-130b-9947" type="profile">
           <modifierGroups>
@@ -1419,6 +1432,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="18e7-2755-41be-00c0" name="Heavy Torpedo Salvo " publicationId="7f09-e243-2307-78d0" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8e5f-dcde-3170-9e35" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="565a-7355-74fb-3684" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="dff5-52a0-f277-63f6" name="Submerged" hidden="false" targetId="4c9f-29cc-d354-a5f9" type="rule"/>
         <infoLink id="4482-ae5c-d9b6-5657" name="Heavy Torpedo Salvo" hidden="false" targetId="5ce5-2226-6c2d-fb48" type="profile">
@@ -1448,6 +1465,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="1420-4e0a-ca1d-6cb7" name="Rocket Battery" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="468e-97f8-6f97-0e97" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="79b2-02f8-de28-7559" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="f6d5-1151-c82b-2825" name="Rocket Battery" hidden="false" targetId="90e8-0288-ed1a-f4fb" type="profile">
           <modifierGroups>
@@ -1685,7 +1706,19 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
     </selectionEntry>
     <selectionEntry id="2dfb-ebc3-cd98-5c05" name="Shockwave Pulse" publicationId="e265-8c7f-a4b2-a48e" hidden="false" collective="false" import="true" type="upgrade">
       <infoLinks>
-        <infoLink id="14ea-613f-0e51-da4f" name="Shockwave Pulse" hidden="false" targetId="b572-6de9-ccd4-9032" type="profile"/>
+        <infoLink id="14ea-613f-0e51-da4f" name="Shockwave Pulse" hidden="false" targetId="b572-6de9-ccd4-9032" type="profile">
+          <modifierGroups>
+            <modifierGroup>
+              <modifiers>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="360°">
+                  <conditions>
+                    <condition field="selections" scope="2dfb-ebc3-cd98-5c05" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="a4f6-2208-db34-4879" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
+            </modifierGroup>
+          </modifierGroups>
+        </infoLink>
         <infoLink id="c135-3bfc-ca50-759b" name="Torrent" hidden="false" targetId="8081-2eef-5594-eb78" type="rule">
           <modifiers>
             <modifier type="append" field="name" value=" (Small)"/>
@@ -1842,6 +1875,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="26a3-cf78-63bd-dd6b" name="Heavy Torpedo Turret" publicationId="129d-da97-caec-1ddd" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6e95-846b-a676-59da" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="da5b-4e98-454b-cea9" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="237e-9f91-279f-8a4f" name="Extreme Range" hidden="false" targetId="d3ac-5484-ad1a-0c87" type="rule"/>
         <infoLink id="fb8c-6e4e-f5a4-5b42" name="Heavy Torpedo Turret" hidden="false" targetId="c4fc-e39d-2c42-c337" type="profile">
@@ -1900,7 +1937,11 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="0946-1dc0-1c55-5716" name="Bananach Phosphor Bombs" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="upgrade">
+    <selectionEntry id="0946-1dc0-1c55-5716" name="Bananach Phosphor Bombs" publicationId="dbca-8d57-b848-457e" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="05f0-e9ad-1287-28d6" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="87b0-16bd-cf14-c11b" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="1780-8778-db7b-ded7" name="Bananach Phosphor Bombs" hidden="false" targetId="3726-3c02-563d-e218" type="profile">
           <modifiers>
@@ -2029,6 +2070,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="3b69-5936-2ff8-bc08" name="Heavy Prow Ram" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="aa8f-5d30-ff76-74f4" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d9fa-a20d-cd91-3f36" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="3b53-085c-5a39-82e6" name="Heavy Prow Ram" hidden="false" targetId="d088-251e-5c6b-83bf" type="profile">
           <modifierGroups>
@@ -2081,7 +2126,6 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
             </modifierGroup>
           </modifierGroups>
         </infoLink>
-        <infoLink id="b383-4b19-33d1-b0e5" name="Submerged" hidden="false" targetId="4c9f-29cc-d354-a5f9" type="rule"/>
         <infoLink id="67f9-5dde-7839-13a4" name="Torpedo" hidden="false" targetId="d673-c4da-202e-fbfc" type="rule"/>
         <infoLink id="4462-dada-c951-adc0" name="High Velocity" hidden="false" targetId="5b8e-71d1-641d-73f9" type="rule"/>
         <infoLink id="6b19-cc79-4d26-fddb" name="Aerial" hidden="false" targetId="c475-4c4f-de22-9080" type="rule"/>
@@ -2303,6 +2347,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="7d6e-51f6-d5e5-200b" name="Scything Blades" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9106-16cf-54b9-ede7" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2051-2147-dfd6-8f93" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="74d7-b767-4c50-802e" name="Scything Blades" hidden="false" targetId="2bdd-d4bc-b3ec-2210" type="profile">
           <modifierGroups>
@@ -2420,6 +2468,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="8831-12af-37ef-1633" name="Ryoba Prow Saw" publicationId="dbca-8d57-b848-457e" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="8c3f-64d4-7779-4fc0" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d896-49f4-c80b-3c6e" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="67d0-1d1d-ace6-5d16" name="Ryoba Prow Saw" hidden="false" targetId="d302-22ff-874c-7809" type="profile">
           <modifiers>
@@ -2439,6 +2491,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="4e2e-beb0-7b7d-0f80" name="Scalpel Lancette" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="00b7-86ac-827d-5052" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="0c7d-60da-369a-24a8" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="3222-5eca-406b-584d" name="Scalpel Lancette" hidden="false" targetId="6244-3624-bb86-3bd6" type="profile">
           <modifierGroups>
@@ -2732,7 +2788,11 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="9938-990c-3af2-c9b4" name="Alchemical Cluster Bombs" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="false" import="true" type="upgrade">
+    <selectionEntry id="9938-990c-3af2-c9b4" name="Alchemical Cluster Bombs" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="90c4-cbda-f80f-46db" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="182b-753e-47f1-16c2" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="79b5-e71f-d345-aad8" name="Alchemical Cluster Bombs" hidden="false" targetId="2c07-50b0-e9fb-2503" type="profile">
           <modifierGroups>
@@ -2790,7 +2850,7 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="b9db-a782-8ccf-23ef" type="max"/>
       </constraints>
       <infoLinks>
-        <infoLink id="a2a6-a13e-1189-4182" name="Alchemical" hidden="false" targetId="b69e-5981-d88e-75de" type="rule"/>
+        <infoLink id="a2a6-a13e-1189-4182" name="Hyperbeam Lense Cannon (3.04)" hidden="false" targetId="f1ec-f03e-cbe8-843e" type="rule"/>
         <infoLink id="43e1-a60c-f5b0-fcb8" name="Hyperbeam Lense Cannon" hidden="false" targetId="3032-2661-6403-a23d" type="profile">
           <modifierGroups>
             <modifierGroup>
@@ -2804,7 +2864,6 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
             </modifierGroup>
           </modifierGroups>
         </infoLink>
-        <infoLink id="e945-3d03-49bc-13f1" name="Gunnery" hidden="false" targetId="c20b-cc1d-12bf-23a8" type="rule"/>
         <infoLink id="7613-b5fd-1375-2f2e" name="Extreme Range" hidden="false" targetId="d3ac-5484-ad1a-0c87" type="rule"/>
       </infoLinks>
       <costs>
@@ -2987,6 +3046,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="db84-1c9c-98de-aa16" name="Orichalcite Flechette Launcher" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="6ffa-c0d8-3405-6ab9" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3c82-7423-c7df-9c3d" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="afa5-5683-a1b6-1e3d" name="Fusillade" hidden="false" targetId="4ec1-3aa3-001e-f8f6" type="rule"/>
         <infoLink id="1f7f-ba4b-1fa2-7ca2" name="Blast" hidden="false" targetId="89d8-2e21-11be-005d" type="rule"/>
@@ -2999,6 +3062,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="6a66-1016-ae4a-e291" name="Salvo Missile Silo" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="0174-f809-f47c-4e8d" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5815-1e28-b031-7115" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="dc7e-3e7e-a65a-adbf" name="Aerial" hidden="false" targetId="c475-4c4f-de22-9080" type="rule"/>
         <infoLink id="5ac7-6b55-74b9-7b2d" name="Blast" hidden="false" targetId="89d8-2e21-11be-005d" type="rule"/>
@@ -3219,6 +3286,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="fba5-ca79-6f57-9ef2" name="Heat Lancette" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="a194-80eb-c093-7e20" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="3ea5-5c0b-3b5a-1365" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="13c9-52aa-99c0-890f" name="Gunnery" hidden="false" targetId="c20b-cc1d-12bf-23a8" type="rule"/>
         <infoLink id="ae19-8ae1-1aef-9f9a" name="Heat Lancette" hidden="false" targetId="0b12-ea7f-69ca-8034" type="profile">
@@ -3272,6 +3343,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="7dba-1c8d-ba19-7ccb" name="Cymbeline Missile Silo" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="92a1-3f83-172d-77e0" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="8da9-9efe-85cc-bb4b" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="0aaa-ecf9-cdf1-0d34" name="Cymbeline Missile Silo" hidden="false" targetId="188b-dba1-865c-23c9" type="profile">
           <modifierGroups>
@@ -3423,6 +3498,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="e8d5-6319-67ea-821d" name="Heavy Gun Battery" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="fff4-359a-e423-0419" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e367-ab03-77fa-12f0" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="736b-c19a-44a5-0734" name="Heavy Gun Battery" hidden="false" targetId="4307-eab2-99cf-555e" type="profile">
           <modifierGroups>
@@ -3520,7 +3599,6 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
             </modifierGroup>
           </modifierGroups>
         </infoLink>
-        <infoLink id="f3f9-3d91-7a6c-b3be" name="Submerged" hidden="false" targetId="4c9f-29cc-d354-a5f9" type="rule"/>
         <infoLink id="ccea-e710-a69a-6aee" name="Torpedo" hidden="false" targetId="d673-c4da-202e-fbfc" type="rule"/>
         <infoLink id="cabf-f64b-ca95-cbfc" name="High Velocity" hidden="false" targetId="5b8e-71d1-641d-73f9" type="rule"/>
         <infoLink id="62e8-dd01-584c-d27d" name="Aerial" hidden="false" targetId="c475-4c4f-de22-9080" type="rule"/>
@@ -3531,6 +3609,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="3d0e-d034-a0b1-f724" name="Heavy Alchemical Rockets" publicationId="7b2b-0f56-3962-5ec1" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="54e8-a258-659c-9930" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="4c06-4f20-4b0e-e910" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="7ff2-84ba-6b40-ef0d" name="Heavy Alchemical Rockets" hidden="false" targetId="cbdd-4c2a-6c09-f3d6" type="profile">
           <modifierGroups>
@@ -3601,6 +3683,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="f7e0-fd3a-7201-ad0f" name="Heavy Rocket Battery" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5781-1c58-9ef5-797a" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="cc37-580e-0bae-89c1" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="1cb1-67df-e60e-41a5" name="Heavy Rocket Battery" hidden="false" targetId="5aa0-82a6-e6bc-6950" type="profile">
           <modifierGroups>
@@ -4071,6 +4157,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="e70f-ef5d-1b71-fdf6" name="Pulse Broadside" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="253e-a56f-8405-ef24" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="1318-6750-fa1d-2b01" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="7e85-9be0-a67a-ecfc" name="Pulse Broadside" hidden="false" targetId="7477-6c6d-1faa-a8c5" type="profile">
           <modifierGroups>
@@ -4099,6 +4189,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="5dcb-4100-3eab-e801" name="Particle Beamer" hidden="false" collective="false" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="47d2-1442-0f71-ac34" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9cfb-254a-51ab-db0f" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="57cf-dee5-f7b8-2e91" name="Particle Beamer" hidden="false" targetId="31a4-53c0-305c-d8fb" type="profile">
           <modifierGroups>
@@ -5192,6 +5286,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="40cf-c845-ac81-afe2" name="Particle Beamer" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="91f5-8f9e-0a8a-cc50" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="5515-311d-3473-7308" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="81fb-f031-5303-496c" name="Particle Beamer" hidden="false" targetId="31a4-53c0-305c-d8fb" type="profile">
           <modifierGroups>
@@ -5267,6 +5365,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="9985-b088-fda6-36d4" name="Heavy Broadside" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c099-826a-e3fd-19f9" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="4e26-5fd4-6ed6-fa67" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="2ec1-3668-aa6e-0537" name="Heavy Broadside" hidden="false" targetId="53dd-93fd-f789-bf9e" type="profile">
           <modifierGroups>
@@ -5274,7 +5376,7 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
               <modifiers>
                 <modifier type="set" field="8739-aae9-7e50-c8d0" value="A &amp; P &amp; S">
                   <conditions>
-                    <condition field="selections" scope="9985-b088-fda6-36d4" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" childId="372f-19f1-09ed-e694" type="instanceOf"/>
+                    <condition field="selections" scope="9985-b088-fda6-36d4" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" childId="27c7-6494-d18b-0d70" type="instanceOf"/>
                   </conditions>
                 </modifier>
                 <modifier type="set" field="8739-aae9-7e50-c8d0" value="F &amp; A">
@@ -5284,7 +5386,7 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
                 </modifier>
                 <modifier type="set" field="8739-aae9-7e50-c8d0" value="P &amp; S">
                   <conditions>
-                    <condition field="selections" scope="9985-b088-fda6-36d4" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" childId="27c7-6494-d18b-0d70" type="instanceOf"/>
+                    <condition field="selections" scope="9985-b088-fda6-36d4" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" childId="372f-19f1-09ed-e694" type="instanceOf"/>
                   </conditions>
                 </modifier>
               </modifiers>
@@ -5765,6 +5867,10 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
       </costs>
     </selectionEntry>
     <selectionEntry id="5fe7-329e-4129-b89e" name="Vengeance Keel Saw" publicationId="dbca-8d57-b848-457e" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="c9d1-49cb-e900-e771" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2363-7c79-7bd4-3104" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="4fce-3f7a-c8b3-a259" name="Vengeance Keel Saw" hidden="false" targetId="e9f8-1bef-5728-21d9" type="profile">
           <modifiers>
@@ -6126,7 +6232,11 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
-    <selectionEntry id="558d-7511-d6e9-063d" name="Canberra Gyro-Bomb Launcher" publicationId="dbca-8d57-b848-457e" hidden="false" collective="false" import="true" type="upgrade">
+    <selectionEntry id="558d-7511-d6e9-063d" name="Canberra Gyro-Bomb Launcher" publicationId="dbca-8d57-b848-457e" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="d4e7-d774-6c2d-dce2" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="2630-bb8e-d487-9008" type="max"/>
+      </constraints>
       <infoLinks>
         <infoLink id="edf2-db9a-957c-29de" name="Canberra Gyro-Bomb Launcher" hidden="false" targetId="9ef7-0f64-746b-7712" type="profile">
           <modifierGroups>
@@ -6151,6 +6261,71 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
         <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
       </costs>
     </selectionEntry>
+    <selectionEntry id="62a4-b440-678e-256f" name="Claw Arc Projector" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="cbef-d636-3aad-ff0a" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="6e0b-0077-8fd8-6cfb" type="max"/>
+      </constraints>
+      <infoLinks>
+        <infoLink id="d992-2040-a566-60b9" name="Claw Arc Projector" hidden="false" targetId="ddea-5254-393b-7b2b" type="profile">
+          <modifierGroups>
+            <modifierGroup>
+              <modifiers>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="F/P/S">
+                  <conditions>
+                    <condition field="selections" scope="62a4-b440-678e-256f" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="a4f6-2208-db34-4879" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="360°">
+                  <conditions>
+                    <condition field="selections" scope="62a4-b440-678e-256f" value="1.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="true" childId="db84-bb03-d026-c3a5" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
+            </modifierGroup>
+          </modifierGroups>
+        </infoLink>
+        <infoLink id="8b12-73e1-2440-f8d9" name="Ramming" hidden="false" targetId="c92a-830a-302c-d3ab" type="rule">
+          <modifiers>
+            <modifier type="append" field="name" value=" 10/8"/>
+          </modifiers>
+        </infoLink>
+        <infoLink id="7209-60fb-c4ea-b94e" name="Devastating" hidden="false" targetId="d633-3476-6a40-e860" type="rule"/>
+        <infoLink id="4f99-0d79-7ff0-0347" name="Arc" hidden="false" targetId="6d56-fa67-1d6d-022b" type="rule"/>
+      </infoLinks>
+      <costs>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+      </costs>
+    </selectionEntry>
+    <selectionEntry id="8cc0-9c4e-e741-ff9c" name="Heavy Magnetic Bombard" hidden="false" collective="true" import="true" type="upgrade">
+      <constraints>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9650-bdaa-f51e-7556" type="min"/>
+        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="9192-950c-83df-370d" type="max"/>
+      </constraints>
+      <infoLinks>
+        <infoLink id="dd01-3871-a746-a3d7" name="Heavy Magnetic Bombard" publicationId="e265-8c7f-a4b2-a48e" hidden="false" targetId="9bb9-6b13-3626-ae41" type="profile">
+          <modifierGroups>
+            <modifierGroup>
+              <modifiers>
+                <modifier type="set" field="8739-aae9-7e50-c8d0" value="F">
+                  <conditions>
+                    <condition field="selections" scope="8cc0-9c4e-e741-ff9c" value="1.0" percentValue="false" shared="false" includeChildSelections="true" includeChildForces="true" childId="dbb4-72d5-bceb-70b3" type="instanceOf"/>
+                  </conditions>
+                </modifier>
+              </modifiers>
+            </modifierGroup>
+          </modifierGroups>
+        </infoLink>
+        <infoLink id="d775-8ff2-4f5e-50c2" name="Extreme Range" hidden="false" targetId="d3ac-5484-ad1a-0c87" type="rule"/>
+        <infoLink id="1345-39dd-116d-02a5" name="Aerial" hidden="false" targetId="c475-4c4f-de22-9080" type="rule"/>
+        <infoLink id="3f6d-eeb6-98eb-8e6c" name="Magnetic" hidden="false" targetId="8c21-7eac-4f35-4268" type="rule"/>
+      </infoLinks>
+      <costs>
+        <cost name="Points" typeId="7c9b-6b09-b5ac-2249" value="0.0"/>
+        <cost name="Victory Points" typeId="426e-670d-6ddd-9631" value="0.0"/>
+      </costs>
+    </selectionEntry>
   </sharedSelectionEntries>
   <sharedRules>
     <rule id="c475-4c4f-de22-9080" name="Aerial" publicationId="7f09-e243-2307-78d0" page="" hidden="false">
@@ -6243,9 +6418,20 @@ Review v15: start of review for 3.04 Orbats (rev.4)</readme>
     <rule id="5f8b-1815-9738-ae2c" name="D-Cannon**" publicationId="d854-a2d6-3d52-44c4" hidden="false">
       <description>As a Valour Effect, before targets are declared using this weapon, all D-Cannons in the Unit lose the Indirect Quality and instead gain the Devastating Quality. D-Cannon Batteries ignore Shield Generators.</description>
     </rule>
-    <rule id="f063-dc19-1b5c-313e" name="Rail" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
-      <description>
-The Citadel of the Initial Target receives a -1 against Actions with this Quality. When making an Action against Models with the Skimming Unit or Aerial Unit Positional Traits, each weapon receives +1 Action Dice. When making an Action against Models with the Submerged Unit Positional Trait, each weapon receives -1 Action Dice.</description>
+    <rule id="f063-dc19-1b5c-313e" name="Rail**" publicationId="e265-8c7f-a4b2-a48e" hidden="false">
+      <description>The Citadel of the Initial Target receives a -1 against Actions with this Quality. Furthermore, when making an Action against Models with the Skimming Unit or Aerial Unit Positional Traits, each weapon or SRS Token with this Quality receives +1 Action Dice (to a maximum of +3). When making an Action against Models with the Submerged Unit Positional Trait, each weapon or SRS Token with this Quality receives -1 Action Dice (to a maximum of -3).</description>
+    </rule>
+    <rule id="f1ec-f03e-cbe8-843e" name="Hyperbeam Lense Cannon (3.04)" publicationId="7b2b-0f56-3962-5ec1" hidden="false">
+      <description>A Model armed with this weapon chooses an Initial Target in the Shooting Step as normal. Draw a 5mm wide direct line between the centre point of the Initial Target and this Model. Resolve an Attack against each Model touched by the Beam as a separate Attack, with each of those Models (but, importantly, they are not the Initial Target of the Attack for Generators or other rule effects). Roll the number of Action Dice indicated in the Range Band against each Model touched by the line and consult the following table:
+
+- Critical: The Model suffers a Catastrophic Explosion, and the Player may apply the result of a further Action Dice rolled for that range band (if any additional dice have been rolled).
+- H.vy hit: The touched Model suffers a Catastrophic Explosion.
+- Hit: The touched Model suffers a Critical Hit.
+- H.vy Counter: The touched Model gains a Level of Disorder.
+- Counter: The touched Model gains a Level of Disorder.
+- Blank: No effect.
+
+The attacking Player chooses which die result to apply. One of the Action Dice in the roll against the Initial Target may always be counted as an Exploding Hit if one has not been rolled. The Hyperbeam Lense Cannon ignores being Obscured or any Generator effects on Action Dice Pools.</description>
     </rule>
   </sharedRules>
   <sharedProfiles>
@@ -6255,7 +6441,7 @@ The Citadel of the Initial Target receives a -1 against Actions with this Qualit
         <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">9(2) / 6(-)</characteristic>
         <characteristic name="Closing" typeId="d025-b048-0c22-fad5">9(5) / 6(3)</characteristic>
         <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">8(4) / 5(3)</characteristic>
-        <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Submerged, Torpedo, High Velocity</characteristic>
+        <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Aerial, Torpedo, High Velocity</characteristic>
       </characteristics>
     </profile>
     <profile id="a0a8-dac0-e58d-85e2" name="Aerial Torpedo" publicationId="d854-a2d6-3d52-44c4" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
@@ -6307,8 +6493,8 @@ The Citadel of the Initial Target receives a -1 against Actions with this Qualit
       <characteristics>
         <characteristic name="Arc" typeId="8739-aae9-7e50-c8d0">-</characteristic>
         <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">5(1) / 4(-)</characteristic>
-        <characteristic name="Closing" typeId="d025-b048-0c22-fad5">5(2) / 4(1)</characteristic>
-        <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">5(2) / 4(1)</characteristic>
+        <characteristic name="Closing" typeId="d025-b048-0c22-fad5">5(2) / 4(2)</characteristic>
+        <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">5(2) / 4(2)</characteristic>
         <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Aerial, Alchemical</characteristic>
       </characteristics>
     </profile>
@@ -6389,7 +6575,7 @@ The Citadel of the Initial Target receives a -1 against Actions with this Qualit
         <characteristic name="Arc" typeId="8739-aae9-7e50-c8d0">-</characteristic>
         <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">-</characteristic>
         <characteristic name="Closing" typeId="d025-b048-0c22-fad5">4(3) / 3(2)</characteristic>
-        <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">4(3) / 3(2)</characteristic>
+        <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">4(3) / 3(1)</characteristic>
         <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Hazardous, Corrosive Mortar</characteristic>
       </characteristics>
     </profile>
@@ -6423,8 +6609,8 @@ The Citadel of the Initial Target receives a -1 against Actions with this Qualit
     <profile id="6834-59ec-a9ed-9dae" name="Dual Magnetic Gatling Guns" publicationId="e6a1-85d3-8979-7880" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
       <characteristics>
         <characteristic name="Arc" typeId="8739-aae9-7e50-c8d0">-</characteristic>
-        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">7(4)/ 4(3)</characteristic>
-        <characteristic name="Closing" typeId="d025-b048-0c22-fad5">4(3)/ 3(2)</characteristic>
+        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">7(4) / 4(3)</characteristic>
+        <characteristic name="Closing" typeId="d025-b048-0c22-fad5">4(3) / 3(2)</characteristic>
         <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">-</characteristic>
         <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Sustained, Magnetic</characteristic>
       </characteristics>
@@ -6432,8 +6618,8 @@ The Citadel of the Initial Target receives a -1 against Actions with this Qualit
     <profile id="108f-eb40-4fe8-46f5" name="Dual Naval Electrocannons" publicationId="e6a1-85d3-8979-7880" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
       <characteristics>
         <characteristic name="Arc" typeId="8739-aae9-7e50-c8d0">-</characteristic>
-        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">5(4)/ 4(2)</characteristic>
-        <characteristic name="Closing" typeId="d025-b048-0c22-fad5">4(2)/ 3(1)</characteristic>
+        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">5(4) / 4(2)</characteristic>
+        <characteristic name="Closing" typeId="d025-b048-0c22-fad5">4(2) / 3(1)</characteristic>
         <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">-</characteristic>
         <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Gunnery, Arc</characteristic>
       </characteristics>
@@ -6585,8 +6771,8 @@ The Citadel of the Initial Target receives a -1 against Actions with this Qualit
     <profile id="b8bd-0237-312d-2fee" name="Heavy Huoqiang (Blade)" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
       <characteristics>
         <characteristic name="Arc" typeId="8739-aae9-7e50-c8d0">-</characteristic>
-        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">9(4) / -</characteristic>
-        <characteristic name="Closing" typeId="d025-b048-0c22-fad5">6(3) / -</characteristic>
+        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">10(5) / -</characteristic>
+        <characteristic name="Closing" typeId="d025-b048-0c22-fad5"> -</characteristic>
         <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">-</characteristic>
         <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Gunnery, Alchemical, Hazardous</characteristic>
       </characteristics>
@@ -6711,7 +6897,7 @@ The Citadel of the Initial Target receives a -1 against Actions with this Qualit
     <profile id="3237-dbb9-e219-818f" name="Huoqiang (Blade)" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
       <characteristics>
         <characteristic name="Arc" typeId="8739-aae9-7e50-c8d0">-</characteristic>
-        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">7(3) / -</characteristic>
+        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">6(4) / -</characteristic>
         <characteristic name="Closing" typeId="d025-b048-0c22-fad5">-</characteristic>
         <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">-</characteristic>
         <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Gunnery, Alchemical, Hazardous</characteristic>
@@ -6720,7 +6906,7 @@ The Citadel of the Initial Target receives a -1 against Actions with this Qualit
     <profile id="69d0-13df-715a-c7f3" name="Huoqiang (Gout)" publicationId="7b2b-0f56-3962-5ec1" page="" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
       <characteristics>
         <characteristic name="Arc" typeId="8739-aae9-7e50-c8d0">-</characteristic>
-        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">7(3) / 7(3)</characteristic>
+        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">5(3) / 5(3)</characteristic>
         <characteristic name="Closing" typeId="d025-b048-0c22-fad5">-</characteristic>
         <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">-</characteristic>
         <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Torrent (Small), Alchemical, Fusillade</characteristic>
@@ -6738,10 +6924,10 @@ The Citadel of the Initial Target receives a -1 against Actions with this Qualit
     <profile id="3032-2661-6403-a23d" name="Hyperbeam Lense Cannon" publicationId="7b2b-0f56-3962-5ec1" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
       <characteristics>
         <characteristic name="Arc" typeId="8739-aae9-7e50-c8d0">-</characteristic>
-        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">10(0) / -</characteristic>
+        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">1(0) / -</characteristic>
         <characteristic name="Closing" typeId="d025-b048-0c22-fad5">2(0) / 1(0)</characteristic>
         <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">3(0) / 2(0)</characteristic>
-        <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Extreme Range</characteristic>
+        <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Extreme Range, Hyperbeam Lense Cannon</characteristic>
       </characteristics>
     </profile>
     <profile id="8fff-6855-6e17-abc7" name="Judgement Lance" publicationId="d854-a2d6-3d52-44c4" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
@@ -6993,7 +7179,7 @@ The Citadel of the Initial Target receives a -1 against Actions with this Qualit
         <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">-</characteristic>
         <characteristic name="Closing" typeId="d025-b048-0c22-fad5">-</characteristic>
         <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">-</characteristic>
-        <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Ramming 12, Devastating</characteristic>
+        <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Ramming 12/12, Devastating</characteristic>
       </characteristics>
     </profile>
     <profile id="10f4-a9d7-24c1-a973" name="Salvo Missile Silo" publicationId="d854-a2d6-3d52-44c4" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
@@ -7008,7 +7194,7 @@ The Citadel of the Initial Target receives a -1 against Actions with this Qualit
     <profile id="6244-3624-bb86-3bd6" name="Scalpel Lancette" publicationId="7b2b-0f56-3962-5ec1" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">
       <characteristics>
         <characteristic name="Arc" typeId="8739-aae9-7e50-c8d0">-</characteristic>
-        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">7(4) / 5(3)</characteristic>
+        <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">10(5) / 9(4)</characteristic>
         <characteristic name="Closing" typeId="d025-b048-0c22-fad5">-</characteristic>
         <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">-</characteristic>
         <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Gunnery, Hazardous, Devastating</characteristic>
@@ -7020,7 +7206,7 @@ The Citadel of the Initial Target receives a -1 against Actions with this Qualit
         <characteristic name="Point Blank" typeId="4209-eb47-9807-b834">-</characteristic>
         <characteristic name="Closing" typeId="d025-b048-0c22-fad5">-</characteristic>
         <characteristic name="Long" typeId="06b8-7f5e-e2df-751a">-</characteristic>
-        <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Ramming 6, Piercing, Sustained</characteristic>
+        <characteristic name="Quality" typeId="faa3-d69c-5156-2acf">Ramming 10/8, Piercing, Sustained</characteristic>
       </characteristics>
     </profile>
     <profile id="9d52-19df-1515-2345" name="Seeker Rocket Battery" publicationId="908d-6feb-2e9e-843b" hidden="false" typeId="6c9b-5228-c790-9c90" typeName="Weapon">