diff --git a/Deathwatch - Codex.cat b/Deathwatch - Codex.cat
index cc1ebb51..0c82717d 100644
--- a/Deathwatch - Codex.cat	
+++ b/Deathwatch - Codex.cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="ee8b-68c8-02226-2d18" name="Deathwatch: Codex (2016)" book="Codex: Adeptus Astartes Deathwatch" revision="2014" battleScribeVersion="2.00" authorName="https://gitter.im/BSData/wh40k" authorContact="@BSData" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="ee8b-68c8-02226-2d18" name="Deathwatch: Codex (2016)" book="Codex: Adeptus Astartes Deathwatch" revision="2015" battleScribeVersion="2.00" authorName="https://gitter.im/BSData/wh40k" authorContact="@BSData" authorUrl="http://battlescribedata.appspot.com/#/repo/wh40k" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profiles/>
   <rules/>
   <infoLinks/>
@@ -3169,7 +3169,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="d02a-c521-8a0f-e614" hidden="false" targetId="b84737b6-d86b-893c-5615-727ace6b72c3" type="profile">
+            <infoLink id="d02a-c521-8a0f-e614" hidden="false" targetId="3d4b-95ea-f860-dd22" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -3750,7 +3750,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
               <profiles/>
               <rules/>
               <infoLinks>
-                <infoLink id="7e3f-684c-39c2-226e" hidden="false" targetId="f0e6246d-137e-7921-4209-99318a073b42" type="profile">
+                <infoLink id="7e3f-684c-39c2-226e" hidden="false" targetId="4b04-2a83-8ae7-d134" type="profile">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
@@ -4268,7 +4268,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
       </profiles>
       <rules/>
       <infoLinks>
-        <infoLink id="7f87-e228-b5c1-1644" hidden="false" targetId="f0e6246d-137e-7921-4209-99318a073b42" type="profile">
+        <infoLink id="7f87-e228-b5c1-1644" hidden="false" targetId="4b04-2a83-8ae7-d134" type="profile">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -4381,7 +4381,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
                       <profiles/>
                       <rules/>
                       <infoLinks>
-                        <infoLink id="dbad-7ac7-bcf4-691e" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+                        <infoLink id="dbad-7ac7-bcf4-691e" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
                           <profiles/>
                           <rules/>
                           <infoLinks/>
@@ -4658,7 +4658,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
               <profiles/>
               <rules/>
               <infoLinks>
-                <infoLink id="5f88-752f-9a45-599b" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+                <infoLink id="5f88-752f-9a45-599b" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
@@ -4988,7 +4988,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
                           <profiles/>
                           <rules/>
                           <infoLinks>
-                            <infoLink id="25e9-cf56-af3e-f625" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+                            <infoLink id="25e9-cf56-af3e-f625" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
                               <profiles/>
                               <rules/>
                               <infoLinks/>
@@ -5187,7 +5187,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
                           <profiles/>
                           <rules/>
                           <infoLinks>
-                            <infoLink id="be9f-3ce3-d170-fe2d" hidden="false" targetId="d2be9ef8-cf0c-44a8-1ab6-37d1e302dabc" type="profile">
+                            <infoLink id="be9f-3ce3-d170-fe2d" hidden="false" targetId="87b3-3f6b-ada0-da8d" type="profile">
                               <profiles/>
                               <rules/>
                               <infoLinks/>
@@ -5231,7 +5231,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
                           <profiles/>
                           <rules/>
                           <infoLinks>
-                            <infoLink id="a856-ceb2-bd58-2a64" hidden="false" targetId="b84737b6-d86b-893c-5615-727ace6b72c3" type="profile">
+                            <infoLink id="a856-ceb2-bd58-2a64" hidden="false" targetId="3d4b-95ea-f860-dd22" type="profile">
                               <profiles/>
                               <rules/>
                               <infoLinks/>
@@ -5787,7 +5787,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="63ff-d91e-5461-b786" hidden="false" targetId="025f5b36-b7a0-ab37-0bf3-015ff8c0ccf4" type="profile">
+            <infoLink id="63ff-d91e-5461-b786" hidden="false" targetId="e6d5-677a-d8ed-f6a5" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -5985,7 +5985,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="33a7-50d4-45ac-7af7" hidden="false" targetId="b84737b6-d86b-893c-5615-727ace6b72c3" type="profile">
+            <infoLink id="33a7-50d4-45ac-7af7" hidden="false" targetId="3d4b-95ea-f860-dd22" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -6321,7 +6321,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
           <infoLinks/>
           <modifiers/>
         </infoLink>
-        <infoLink id="22b3-d39b-a12c-6e2e" hidden="false" targetId="f0e6246d-137e-7921-4209-99318a073b42" type="profile">
+        <infoLink id="22b3-d39b-a12c-6e2e" hidden="false" targetId="4b04-2a83-8ae7-d134" type="profile">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -6471,7 +6471,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
           <infoLinks/>
           <modifiers/>
         </infoLink>
-        <infoLink id="aaf9-cdf4-0066-d71c" hidden="false" targetId="f0e6246d-137e-7921-4209-99318a073b42" type="profile">
+        <infoLink id="aaf9-cdf4-0066-d71c" hidden="false" targetId="4b04-2a83-8ae7-d134" type="profile">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -6627,7 +6627,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
           <infoLinks/>
           <modifiers/>
         </infoLink>
-        <infoLink id="1fc9-45ac-e6e8-46a8" hidden="false" targetId="f0e6246d-137e-7921-4209-99318a073b42" type="profile">
+        <infoLink id="1fc9-45ac-e6e8-46a8" hidden="false" targetId="4b04-2a83-8ae7-d134" type="profile">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -6909,7 +6909,7 @@ The Knight has a 4+ invulnerable save against all hits on that facing until the
                       <profiles/>
                       <rules/>
                       <infoLinks>
-                        <infoLink id="27cf-2eea-38c6-fd3d" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+                        <infoLink id="27cf-2eea-38c6-fd3d" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
                           <profiles/>
                           <rules/>
                           <infoLinks/>
@@ -7472,7 +7472,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="47af-d3de-361a-ebd7" hidden="false" targetId="025f5b36-b7a0-ab37-0bf3-015ff8c0ccf4" type="profile">
+            <infoLink id="47af-d3de-361a-ebd7" hidden="false" targetId="e6d5-677a-d8ed-f6a5" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -7721,7 +7721,7 @@ This is NOT validated through BattleScribe.</description>
                           <profiles/>
                           <rules/>
                           <infoLinks>
-                            <infoLink id="8008-5718-02ce-5401" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+                            <infoLink id="8008-5718-02ce-5401" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
                               <profiles/>
                               <rules/>
                               <infoLinks/>
@@ -7920,7 +7920,7 @@ This is NOT validated through BattleScribe.</description>
                           <profiles/>
                           <rules/>
                           <infoLinks>
-                            <infoLink id="7c7f-dfa7-9d2c-2a82" hidden="false" targetId="d2be9ef8-cf0c-44a8-1ab6-37d1e302dabc" type="profile">
+                            <infoLink id="7c7f-dfa7-9d2c-2a82" hidden="false" targetId="87b3-3f6b-ada0-da8d" type="profile">
                               <profiles/>
                               <rules/>
                               <infoLinks/>
@@ -7964,7 +7964,7 @@ This is NOT validated through BattleScribe.</description>
                           <profiles/>
                           <rules/>
                           <infoLinks>
-                            <infoLink id="c79f-4c3a-cc4c-eef5" hidden="false" targetId="b84737b6-d86b-893c-5615-727ace6b72c3" type="profile">
+                            <infoLink id="c79f-4c3a-cc4c-eef5" hidden="false" targetId="3d4b-95ea-f860-dd22" type="profile">
                               <profiles/>
                               <rules/>
                               <infoLinks/>
@@ -8291,7 +8291,7 @@ This is NOT validated through BattleScribe.</description>
       </profiles>
       <rules/>
       <infoLinks>
-        <infoLink id="e114-268c-df28-1cdd" hidden="false" targetId="f0e6246d-137e-7921-4209-99318a073b42" type="profile">
+        <infoLink id="e114-268c-df28-1cdd" hidden="false" targetId="4b04-2a83-8ae7-d134" type="profile">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -8441,7 +8441,7 @@ This is NOT validated through BattleScribe.</description>
         </rule>
       </rules>
       <infoLinks>
-        <infoLink id="3b4e-9311-935d-1258" hidden="false" targetId="f0e6246d-137e-7921-4209-99318a073b42" type="profile">
+        <infoLink id="3b4e-9311-935d-1258" hidden="false" targetId="4b04-2a83-8ae7-d134" type="profile">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -8479,7 +8479,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="5b88-9160-203b-a20e" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+            <infoLink id="5b88-9160-203b-a20e" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -8692,7 +8692,7 @@ This is NOT validated through BattleScribe.</description>
               <profiles/>
               <rules/>
               <infoLinks>
-                <infoLink id="857c-d954-3e69-f617" hidden="false" targetId="b84737b6-d86b-893c-5615-727ace6b72c3" type="profile">
+                <infoLink id="857c-d954-3e69-f617" hidden="false" targetId="3d4b-95ea-f860-dd22" type="profile">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
@@ -8786,7 +8786,7 @@ This is NOT validated through BattleScribe.</description>
               <profiles/>
               <rules/>
               <infoLinks>
-                <infoLink id="fa0b-b6e1-6891-7f6f" hidden="false" targetId="b84737b6-d86b-893c-5615-727ace6b72c3" type="profile">
+                <infoLink id="fa0b-b6e1-6891-7f6f" hidden="false" targetId="3d4b-95ea-f860-dd22" type="profile">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
@@ -9063,7 +9063,7 @@ This is NOT validated through BattleScribe.</description>
               <profiles/>
               <rules/>
               <infoLinks>
-                <infoLink id="8099-35aa-29b8-f203" hidden="false" targetId="b84737b6-d86b-893c-5615-727ace6b72c3" type="profile">
+                <infoLink id="8099-35aa-29b8-f203" hidden="false" targetId="3d4b-95ea-f860-dd22" type="profile">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
@@ -9271,7 +9271,7 @@ This is NOT validated through BattleScribe.</description>
               <profiles/>
               <rules/>
               <infoLinks>
-                <infoLink id="2d57-753f-0aed-d1bc" hidden="false" targetId="b84737b6-d86b-893c-5615-727ace6b72c3" type="profile">
+                <infoLink id="2d57-753f-0aed-d1bc" hidden="false" targetId="3d4b-95ea-f860-dd22" type="profile">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
@@ -9534,7 +9534,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="a450-e0d3-63c4-42f3" hidden="false" targetId="cd84-8a55-6ba9-6469" type="profile">
+            <infoLink id="a450-e0d3-63c4-42f3" hidden="false" targetId="525a-3602-7b9a-0559" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -9581,7 +9581,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="12d6-f785-7d71-eb3f" hidden="false" targetId="cd84-8a55-6ba9-6469" type="profile">
+            <infoLink id="12d6-f785-7d71-eb3f" hidden="false" targetId="525a-3602-7b9a-0559" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -9628,7 +9628,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="c4e8-b3c6-cad5-031c" hidden="false" targetId="cd84-8a55-6ba9-6469" type="profile">
+            <infoLink id="c4e8-b3c6-cad5-031c" hidden="false" targetId="525a-3602-7b9a-0559" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -9698,7 +9698,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="c144-963f-2714-bf48" hidden="false" targetId="cd84-8a55-6ba9-6469" type="profile">
+            <infoLink id="c144-963f-2714-bf48" hidden="false" targetId="525a-3602-7b9a-0559" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -10073,7 +10073,7 @@ This is NOT validated through BattleScribe.</description>
                   <infoLinks/>
                   <modifiers/>
                 </infoLink>
-                <infoLink id="9702-a961-42f3-45e7" hidden="false" targetId="d2be9ef8-cf0c-44a8-1ab6-37d1e302dabc" type="profile">
+                <infoLink id="9702-a961-42f3-45e7" hidden="false" targetId="87b3-3f6b-ada0-da8d" type="profile">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
@@ -10259,7 +10259,7 @@ This is NOT validated through BattleScribe.</description>
                   <profiles/>
                   <rules/>
                   <infoLinks>
-                    <infoLink id="d364-7ccf-cda7-45e2" hidden="false" targetId="43d8d9ec-8695-aa55-3250-4e13f05cec93" type="profile">
+                    <infoLink id="d364-7ccf-cda7-45e2" hidden="false" targetId="8194-4688-65b3-f996" type="profile">
                       <profiles/>
                       <rules/>
                       <infoLinks/>
@@ -10322,7 +10322,7 @@ This is NOT validated through BattleScribe.</description>
                   <profiles/>
                   <rules/>
                   <infoLinks>
-                    <infoLink id="a3e3-8b48-97c3-9994" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+                    <infoLink id="a3e3-8b48-97c3-9994" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
                       <profiles/>
                       <rules/>
                       <infoLinks/>
@@ -10508,7 +10508,7 @@ This is NOT validated through BattleScribe.</description>
         </selectionEntry>
       </selectionEntries>
       <selectionEntryGroups>
-        <selectionEntryGroup id="76f5-96c8-920c-d05e" name="Weapon Options" hidden="false" collective="false">
+        <selectionEntryGroup id="76f5-96c8-920c-d05e" name="Weapon Options" hidden="false" collective="false" defaultSelectionEntryId="08dd-b1b2-efff-ac2c">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -10526,7 +10526,15 @@ This is NOT validated through BattleScribe.</description>
                   <modifiers/>
                 </infoLink>
               </infoLinks>
-              <modifiers/>
+              <modifiers>
+                <modifier type="set" field="53ee-f54c-5ed8-dc80" value="0.0">
+                  <repeats/>
+                  <conditions>
+                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="08dd-b1b2-efff-ac2c" type="equalTo"/>
+                  </conditions>
+                  <conditionGroups/>
+                </modifier>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="53ee-f54c-5ed8-dc80" type="max"/>
               </constraints>
@@ -10537,13 +10545,74 @@ This is NOT validated through BattleScribe.</description>
                 <cost name="pts" costTypeId="points" value="30.0"/>
               </costs>
             </selectionEntry>
+            <selectionEntry id="08dd-b1b2-efff-ac2c" name="Bolt Pistol &amp; Chainsword" hidden="false" collective="false" type="upgrade">
+              <profiles/>
+              <rules/>
+              <infoLinks>
+                <infoLink id="bf2f-ee14-d9bd-6c84" name="New InfoLink" hidden="false" targetId="e6d5-677a-d8ed-f6a5" type="profile">
+                  <profiles/>
+                  <rules/>
+                  <infoLinks/>
+                  <modifiers/>
+                </infoLink>
+                <infoLink id="28d3-0e06-1b04-a9a2" name="New InfoLink" hidden="false" targetId="0c19a0e9-8130-09dd-6826-32b2946a7d48" type="profile">
+                  <profiles/>
+                  <rules/>
+                  <infoLinks/>
+                  <modifiers/>
+                </infoLink>
+              </infoLinks>
+              <modifiers>
+                <modifier type="set" field="416d-6f17-9dc9-87ae" value="0.0">
+                  <repeats/>
+                  <conditions>
+                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4cad-2d96-173a-dac5" type="equalTo"/>
+                  </conditions>
+                  <conditionGroups/>
+                </modifier>
+              </modifiers>
+              <constraints>
+                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="416d-6f17-9dc9-87ae" type="max"/>
+              </constraints>
+              <selectionEntries/>
+              <selectionEntryGroups/>
+              <entryLinks/>
+              <costs/>
+            </selectionEntry>
           </selectionEntries>
           <selectionEntryGroups>
             <selectionEntryGroup id="357f-a167-ba9f-a8b5" name="Choose 2" hidden="false" collective="false">
               <profiles/>
               <rules/>
               <infoLinks/>
-              <modifiers/>
+              <modifiers>
+                <modifier type="set" field="db8b-07d8-2b07-b1dc" value="0.0">
+                  <repeats/>
+                  <conditions/>
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="9b07-2e30-1d2e-ba0f" type="equalTo"/>
+                        <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="578f-42d9-f707-1299" type="equalTo"/>
+                      </conditions>
+                      <conditionGroups/>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+                <modifier type="set" field="af22-f68d-babe-bb3c" value="0.0">
+                  <repeats/>
+                  <conditions/>
+                  <conditionGroups>
+                    <conditionGroup type="or">
+                      <conditions>
+                        <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="4cad-2d96-173a-dac5" type="equalTo"/>
+                        <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="08dd-b1b2-efff-ac2c" type="equalTo"/>
+                      </conditions>
+                      <conditionGroups/>
+                    </conditionGroup>
+                  </conditionGroups>
+                </modifier>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="db8b-07d8-2b07-b1dc" type="min"/>
                 <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="af22-f68d-babe-bb3c" type="max"/>
@@ -10633,7 +10702,7 @@ This is NOT validated through BattleScribe.</description>
                   <profiles/>
                   <rules/>
                   <infoLinks>
-                    <infoLink id="4e8b-9954-8443-53ca" hidden="false" targetId="d2be9ef8-cf0c-44a8-1ab6-37d1e302dabc" type="profile">
+                    <infoLink id="4e8b-9954-8443-53ca" hidden="false" targetId="87b3-3f6b-ada0-da8d" type="profile">
                       <profiles/>
                       <rules/>
                       <infoLinks/>
@@ -10673,7 +10742,7 @@ This is NOT validated through BattleScribe.</description>
                   <profiles/>
                   <rules/>
                   <infoLinks>
-                    <infoLink id="3978-8626-f2d9-dd22" hidden="false" targetId="025f5b36-b7a0-ab37-0bf3-015ff8c0ccf4" type="profile">
+                    <infoLink id="3978-8626-f2d9-dd22" hidden="false" targetId="e6d5-677a-d8ed-f6a5" type="profile">
                       <profiles/>
                       <rules/>
                       <infoLinks/>
@@ -10855,14 +10924,12 @@ This is NOT validated through BattleScribe.</description>
                 </selectionEntry>
               </selectionEntries>
               <selectionEntryGroups>
-                <selectionEntryGroup id="9da5-5d11-2a61-b34a" name="Power Weapon" hidden="false" collective="false">
+                <selectionEntryGroup id="9da5-5d11-2a61-b34a" name="Power Weapon" hidden="true" collective="false">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
                   <modifiers/>
-                  <constraints>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="e470-62d2-176c-ba19" type="max"/>
-                  </constraints>
+                  <constraints/>
                   <selectionEntries/>
                   <selectionEntryGroups/>
                   <entryLinks/>
@@ -11090,7 +11157,7 @@ This is NOT validated through BattleScribe.</description>
       </profiles>
       <rules/>
       <infoLinks>
-        <infoLink id="bd33-a51e-c6c8-009d" hidden="false" targetId="f0e6246d-137e-7921-4209-99318a073b42" type="profile">
+        <infoLink id="bd33-a51e-c6c8-009d" hidden="false" targetId="4b04-2a83-8ae7-d134" type="profile">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -11209,7 +11276,7 @@ This is NOT validated through BattleScribe.</description>
                       <profiles/>
                       <rules/>
                       <infoLinks>
-                        <infoLink id="578c-53ed-d75f-f3e8" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+                        <infoLink id="578c-53ed-d75f-f3e8" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
                           <profiles/>
                           <rules/>
                           <infoLinks/>
@@ -11393,7 +11460,7 @@ This is NOT validated through BattleScribe.</description>
       <profiles/>
       <rules/>
       <infoLinks>
-        <infoLink id="034e-002e-5d5a-7d09" hidden="false" targetId="f0e6246d-137e-7921-4209-99318a073b42" type="profile">
+        <infoLink id="034e-002e-5d5a-7d09" hidden="false" targetId="4b04-2a83-8ae7-d134" type="profile">
           <profiles/>
           <rules/>
           <infoLinks/>
@@ -11464,7 +11531,7 @@ This is NOT validated through BattleScribe.</description>
               <profiles/>
               <rules/>
               <infoLinks>
-                <infoLink id="ea17-adf3-0bbf-d8a1" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+                <infoLink id="ea17-adf3-0bbf-d8a1" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
@@ -11577,7 +11644,15 @@ This is NOT validated through BattleScribe.</description>
                   <modifiers/>
                 </infoLink>
               </infoLinks>
-              <modifiers/>
+              <modifiers>
+                <modifier type="set" field="787b-1019-d6e2-d3fd" value="0">
+                  <repeats/>
+                  <conditions>
+                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="578f-42d9-f707-1299" type="equalTo"/>
+                  </conditions>
+                  <conditionGroups/>
+                </modifier>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="787b-1019-d6e2-d3fd" type="max"/>
               </constraints>
@@ -11592,7 +11667,7 @@ This is NOT validated through BattleScribe.</description>
               <profiles/>
               <rules/>
               <infoLinks>
-                <infoLink id="2b40-8617-4585-deba" name="New InfoLink" hidden="false" targetId="b84737b6-d86b-893c-5615-727ace6b72c3" type="profile">
+                <infoLink id="2b40-8617-4585-deba" name="New InfoLink" hidden="false" targetId="3d4b-95ea-f860-dd22" type="profile">
                   <profiles/>
                   <rules/>
                   <infoLinks/>
@@ -11605,7 +11680,15 @@ This is NOT validated through BattleScribe.</description>
                   <modifiers/>
                 </infoLink>
               </infoLinks>
-              <modifiers/>
+              <modifiers>
+                <modifier type="set" field="e150-65f1-1589-b804" value="0.0">
+                  <repeats/>
+                  <conditions>
+                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="9b07-2e30-1d2e-ba0f" type="equalTo"/>
+                  </conditions>
+                  <conditionGroups/>
+                </modifier>
+              </modifiers>
               <constraints>
                 <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="e150-65f1-1589-b804" type="max"/>
               </constraints>
@@ -11759,51 +11842,13 @@ This is NOT validated through BattleScribe.</description>
           <infoLinks/>
           <modifiers/>
           <constraints/>
-          <selectionEntries>
-            <selectionEntry id="8f75-6ae1-af8f-4d8e" name="Heavy Thunder Hammer" hidden="false" collective="false" categoryEntryId="(No Category)" type="upgrade">
-              <profiles/>
-              <rules/>
-              <infoLinks>
-                <infoLink id="92f0-2678-5d2b-cfe0" hidden="false" targetId="c5a3-0133-5d5e-2ddc" type="profile">
-                  <profiles/>
-                  <rules/>
-                  <infoLinks/>
-                  <modifiers/>
-                </infoLink>
-              </infoLinks>
-              <modifiers/>
-              <constraints>
-                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="be95-57bd-c24b-039c" type="max"/>
-              </constraints>
-              <selectionEntries/>
-              <selectionEntryGroups/>
-              <entryLinks/>
-              <costs>
-                <cost name="pts" costTypeId="points" value="30.0"/>
-              </costs>
-            </selectionEntry>
-          </selectionEntries>
+          <selectionEntries/>
           <selectionEntryGroups>
             <selectionEntryGroup id="7268-55ca-dfea-71bc" name="Choose 2" hidden="false" collective="false">
               <profiles/>
               <rules/>
               <infoLinks/>
-              <modifiers>
-                <modifier type="set" field="d39f-da1b-329e-91e2" value="0.0">
-                  <repeats/>
-                  <conditions>
-                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="9b07-2e30-1d2e-ba0f" type="equalTo"/>
-                  </conditions>
-                  <conditionGroups/>
-                </modifier>
-                <modifier type="set" field="3e92-f853-1ddb-7400" value="0.0">
-                  <repeats/>
-                  <conditions>
-                    <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="9b07-2e30-1d2e-ba0f" type="equalTo"/>
-                  </conditions>
-                  <conditionGroups/>
-                </modifier>
-              </modifiers>
+              <modifiers/>
               <constraints>
                 <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="3e92-f853-1ddb-7400" type="max"/>
                 <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="d39f-da1b-329e-91e2" type="min"/>
@@ -12382,7 +12427,7 @@ This is NOT validated through BattleScribe.</description>
                   <profiles/>
                   <rules/>
                   <infoLinks>
-                    <infoLink id="9284-5b04-2341-0608" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+                    <infoLink id="9284-5b04-2341-0608" name="s" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
                       <profiles/>
                       <rules/>
                       <infoLinks/>
@@ -13812,7 +13857,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="0bde-df17-5f1c-c47d" hidden="false" targetId="d2be9ef8-cf0c-44a8-1ab6-37d1e302dabc" type="profile">
+            <infoLink id="0bde-df17-5f1c-c47d" hidden="false" targetId="87b3-3f6b-ada0-da8d" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -14033,7 +14078,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="beac-7340-84fb-8a5c" hidden="false" targetId="b84737b6-d86b-893c-5615-727ace6b72c3" type="profile">
+            <infoLink id="beac-7340-84fb-8a5c" hidden="false" targetId="3d4b-95ea-f860-dd22" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -14077,7 +14122,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="29d7-38b0-dffd-cb78" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+            <infoLink id="29d7-38b0-dffd-cb78" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -14237,7 +14282,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="d39f-ffde-7e47-1737" hidden="false" targetId="025f5b36-b7a0-ab37-0bf3-015ff8c0ccf4" type="profile">
+            <infoLink id="d39f-ffde-7e47-1737" hidden="false" targetId="e6d5-677a-d8ed-f6a5" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -14718,7 +14763,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="f975-9d3c-9b7e-6e8a" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+            <infoLink id="f975-9d3c-9b7e-6e8a" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -14784,7 +14829,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="22f5-8ef8-9e6d-88b1" hidden="false" targetId="52510903-e807-324f-4419-55d653290436" type="profile">
+            <infoLink id="22f5-8ef8-9e6d-88b1" hidden="false" targetId="fbed-42ff-591d-13f3" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -14826,7 +14871,7 @@ This is NOT validated through BattleScribe.</description>
           <profiles/>
           <rules/>
           <infoLinks>
-            <infoLink id="b015-44bc-4752-2bf2" hidden="false" targetId="1fa19a43-d532-0ff4-7acd-642e4350b585" type="profile">
+            <infoLink id="b015-44bc-4752-2bf2" hidden="false" targetId="505e-a5aa-edab-6d5b" type="profile">
               <profiles/>
               <rules/>
               <infoLinks/>
@@ -15620,30 +15665,6 @@ You must accept the second roll , even if it is worse than the first.</descripti
         <characteristic name="Type" characteristicTypeId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" value="Heavy 1, Large Blast, Ignores Cover"/>
       </characteristics>
     </profile>
-    <profile id="025f5b36-b7a0-ab37-0bf3-015ff8c0ccf4" name="Bolt Pistol" book="Warhammer 40,00: The Rules" page="176" hidden="false" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48">
-      <profiles/>
-      <rules/>
-      <infoLinks/>
-      <modifiers/>
-      <characteristics>
-        <characteristic name="Range" characteristicTypeId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" value="12&quot;"/>
-        <characteristic name="Strength" characteristicTypeId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" value="4"/>
-        <characteristic name="AP" characteristicTypeId="6abee736-f8d3-498e-97ac-a5c68445609f" value="5"/>
-        <characteristic name="Type" characteristicTypeId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" value="Pistol"/>
-      </characteristics>
-    </profile>
-    <profile id="b84737b6-d86b-893c-5615-727ace6b72c3" name="Boltgun" book="Warhammer 40,00: The Rules" page="176" hidden="false" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48">
-      <profiles/>
-      <rules/>
-      <infoLinks/>
-      <modifiers/>
-      <characteristics>
-        <characteristic name="Range" characteristicTypeId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" value="24&quot;"/>
-        <characteristic name="Strength" characteristicTypeId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" value="4"/>
-        <characteristic name="AP" characteristicTypeId="6abee736-f8d3-498e-97ac-a5c68445609f" value="5"/>
-        <characteristic name="Type" characteristicTypeId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" value="Rapid Fire"/>
-      </characteristics>
-    </profile>
     <profile id="d240-7865-9945-2d3d" name="Brother Galatael" hidden="false" profileTypeId="2d6001b0-980e-46d2-bcc2-a9fc60109afd">
       <profiles/>
       <rules/>
@@ -15680,18 +15701,6 @@ You must accept the second roll , even if it is worse than the first.</descripti
         <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="Melta weapons do not roll an extra D6 penetration when shooting from half range or less. "/>
       </characteristics>
     </profile>
-    <profile id="43d8d9ec-8695-aa55-3250-4e13f05cec93" name="Chainfist" book="Warhammer 40,00: The Rules" page="178" hidden="false" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48">
-      <profiles/>
-      <rules/>
-      <infoLinks/>
-      <modifiers/>
-      <characteristics>
-        <characteristic name="Range" characteristicTypeId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" value="-"/>
-        <characteristic name="Strength" characteristicTypeId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" value="x2"/>
-        <characteristic name="AP" characteristicTypeId="6abee736-f8d3-498e-97ac-a5c68445609f" value="2"/>
-        <characteristic name="Type" characteristicTypeId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" value="Melee, Specialist Weapon, Unwieldly, Armourbane"/>
-      </characteristics>
-    </profile>
     <profile id="0c19a0e9-8130-09dd-6826-32b2946a7d48" name="Chainsword" book="Warhammer 40,00: The Rules" page="178" hidden="false" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48">
       <profiles/>
       <rules/>
@@ -15970,15 +15979,6 @@ You must accept the second roll , even if it is worse than the first.</descripti
         <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="If a model equipped with the Dominus Aegis does not move in the Movement phase, its unit gains a 4+ invulnerable save until the start of your next Movement phase."/>
       </characteristics>
     </profile>
-    <profile id="52510903-e807-324f-4419-55d653290436" name="Dozer Blade " book="Warhammer 40,00: The Rules" page="98" hidden="false" profileTypeId="72c5eafc-75bf-4ed9-b425-78009f1efe82">
-      <profiles/>
-      <rules/>
-      <infoLinks/>
-      <modifiers/>
-      <characteristics>
-        <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="Vehicles equipped with dozer blades treat their front armour as one higher than normal when ramming. Furthermore, the vehicle can re-roll dailed Dangerous Terrain tests. "/>
-      </characteristics>
-    </profile>
     <profile id="6d32-dfd3-4e9a-e842" name="Edryc Setorax" hidden="false" profileTypeId="2d6001b0-980e-46d2-bcc2-a9fc60109afd">
       <profiles/>
       <rules/>
@@ -16692,15 +16692,6 @@ You must accept the second roll , even if it is worse than the first.</descripti
         <characteristic name="Type" characteristicTypeId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" value="Heavy 1, Barrage, 3&quot; Blast, Rocket Barrage"/>
       </characteristics>
     </profile>
-    <profile id="f0e6246d-137e-7921-4209-99318a073b42" name="Searchlight " book="" hidden="false" profileTypeId="72c5eafc-75bf-4ed9-b425-78009f1efe82">
-      <profiles/>
-      <rules/>
-      <infoLinks/>
-      <modifiers/>
-      <characteristics>
-        <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="If a vehicle has a searchlight, it can, after firing all of its weapons choose to illuminate its target with the searchlight. If it does so, it also illuminates itself. Illumination lasts until the end of the following turn. Illuminated units gain no benefit from the Night Fighting special rule. "/>
-      </characteristics>
-    </profile>
     <profile id="7cecbcd2-b268-c364-876d-bae5c9f0a2e0" name="Siege Shield " book="Codex Adeptus Astartes" page="197" hidden="false" profileTypeId="72c5eafc-75bf-4ed9-b425-78009f1efe82">
       <profiles/>
       <rules/>
@@ -16911,18 +16902,6 @@ You must accept the second roll , even if it is worse than the first.</descripti
         <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="Once per game, when Artemis makes close combat attcks, he can choose instead to make a single stasis bomb attack.  If he does so, roll to hit as normal, but resolved the attack at Strength D AP1.  If the attack misses however, Artemis suffers a Str D AP1 hit instead."/>
       </characteristics>
     </profile>
-    <profile id="1fa19a43-d532-0ff4-7acd-642e4350b585" name="Storm Bolter" book="Warhammer 40,00: The Rules" page="176" hidden="false" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48">
-      <profiles/>
-      <rules/>
-      <infoLinks/>
-      <modifiers/>
-      <characteristics>
-        <characteristic name="Range" characteristicTypeId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" value="24&quot;"/>
-        <characteristic name="Strength" characteristicTypeId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" value="4"/>
-        <characteristic name="AP" characteristicTypeId="6abee736-f8d3-498e-97ac-a5c68445609f" value="5"/>
-        <characteristic name="Type" characteristicTypeId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" value="Assault 2"/>
-      </characteristics>
-    </profile>
     <profile id="658fd15b-771f-375a-d3fb-87367b9c46b0" name="Storm Shield " book="Codex Adeptus Astartes" page="196" hidden="false" profileTypeId="72c5eafc-75bf-4ed9-b425-78009f1efe82">
       <profiles/>
       <rules/>
@@ -17010,18 +16989,6 @@ You must accept the second roll , even if it is worse than the first.</descripti
         <characteristic name="Description" characteristicTypeId="21befb24-fc85-4f52-a745-64b2e48f8228" value="At the start of each of your turns, you can pick one of the Mission Tactics listed on pg 103.  Until the start of your next turn, his tactc applies to the model carrying the Tome of Ectoclades, and all oher models in its unit that have the Deathwatch Faction.  This is in addition to the benefits of any other Mission Tactic that may currently be active and affecting your Deathwatch forces."/>
       </characteristics>
     </profile>
-    <profile id="d2be9ef8-cf0c-44a8-1ab6-37d1e302dabc" name="Thunder Hammer" book="Warhammer 40,00: The Rules" page="179" hidden="false" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48">
-      <profiles/>
-      <rules/>
-      <infoLinks/>
-      <modifiers/>
-      <characteristics>
-        <characteristic name="Range" characteristicTypeId="6fa97fa8-ea74-4a27-a0fb-bc4e5f367464" value="-"/>
-        <characteristic name="Strength" characteristicTypeId="a6383362-5aa8-4ff0-b1d0-00e059fc9d45" value="x2"/>
-        <characteristic name="AP" characteristicTypeId="6abee736-f8d3-498e-97ac-a5c68445609f" value="2"/>
-        <characteristic name="Type" characteristicTypeId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" value="Melee, Concussive, Specialist Weapon, Unwieldy"/>
-      </characteristics>
-    </profile>
     <profile id="84af-7198-c926-acf9" name="Twin-Linked Assault Cannon" book="Death from the Skies" page="115" hidden="false" profileTypeId="d5f97c0b-9fc9-478d-aa34-a7c414d3ea48">
       <profiles/>
       <rules/>
@@ -17058,24 +17025,6 @@ You must accept the second roll , even if it is worse than the first.</descripti
         <characteristic name="Type" characteristicTypeId="077c342f-d7b9-45c6-b8af-88e97cafd3a2" value="Heavy 1, Twin-linked"/>
       </characteristics>
     </profile>
-    <profile id="cd84-8a55-6ba9-6469" name="Vanguard Veteran" hidden="false" profileTypeId="2d6001b0-980e-46d2-bcc2-a9fc60109afd">
-      <profiles/>
-      <rules/>
-      <infoLinks/>
-      <modifiers/>
-      <characteristics>
-        <characteristic name="Unit Type" characteristicTypeId="c2b4b061-a0fd-499d-8a3d-6ee52587cbd5" value="Jump Infantry"/>
-        <characteristic name="WS" characteristicTypeId="5ee4ff0b-b244-4670-9d05-91d10f80c32e" value="4"/>
-        <characteristic name="BS" characteristicTypeId="f6f92f00-8bb1-4afa-8ccb-46310b7dd5e5" value="4"/>
-        <characteristic name="S" characteristicTypeId="da036dbb-32c2-430a-9dd5-aa74e0c4f74b" value="4"/>
-        <characteristic name="T" characteristicTypeId="3f9ed75c-36cd-4169-9cef-48391bb55cfd" value="4"/>
-        <characteristic name="W" characteristicTypeId="17ee558f-3014-4bd2-afc1-b474d8d2b7a8" value="1"/>
-        <characteristic name="I" characteristicTypeId="a558b3ef-04d0-440e-a312-bac3255bf592" value="4"/>
-        <characteristic name="A" characteristicTypeId="5dff3e7c-e024-4030-a71d-03195ec06ea7" value="2"/>
-        <characteristic name="Ld" characteristicTypeId="4a42059d-12cd-4c1f-a4c7-bb569d13eeea" value="9"/>
-        <characteristic name="Save" characteristicTypeId="b215fe72-dbce-4ad6-89ec-c4bb3962c39d" value="3+"/>
-      </characteristics>
-    </profile>
     <profile id="525a-3602-7b9a-0559" name="Vanguard Veteran" hidden="false" profileTypeId="2d6001b0-980e-46d2-bcc2-a9fc60109afd">
       <profiles/>
       <rules/>
diff --git a/Eldar - Corsairs (2015).cat b/Eldar - Corsairs (2015).cat
index 8b716ede..4d293277 100644
--- a/Eldar - Corsairs (2015).cat	
+++ b/Eldar - Corsairs (2015).cat	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<catalogue id="3ae4-9ad8-c53f-c5c3" name="Eldar: Corsairs (2015)" book="Imperial Armour 11: Second Edition (2015)" revision="2000" battleScribeVersion="2.00" authorName="Eric Falsken" authorContact="eric@everylittlething.net" authorUrl="https://github.com/BSData/wh40k#warhammer-40000" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
+<catalogue id="3ae4-9ad8-c53f-c5c3" name="Eldar: Corsairs (2015)" book="Imperial Armour 11: Second Edition (2015)" revision="2002" battleScribeVersion="2.00" authorName="Eric Falsken" authorContact="eric@everylittlething.net" authorUrl="https://github.com/BSData/wh40k#warhammer-40000" gameSystemId="e1ebd931-a209-3ce4-87b4-d9918d25530b" gameSystemRevision="2000" xmlns="http://www.battlescribe.net/schema/catalogueSchema">
   <profiles/>
   <rules/>
   <infoLinks/>
@@ -3431,7 +3431,15 @@ No more than one Corsair Baron may be assigned to any single unit, and a Cloud D
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
-      <entryLinks/>
+      <entryLinks>
+        <entryLink id="b7b2-57a7-03f0-30b1" name="New EntryLink" hidden="false" targetId="6fce-9698-40be-cf5e" type="selectionEntryGroup">
+          <profiles/>
+          <rules/>
+          <infoLinks/>
+          <modifiers/>
+          <constraints/>
+        </entryLink>
+      </entryLinks>
       <costs>
         <cost name="pts" costTypeId="points" value="0.0"/>
       </costs>
@@ -5081,7 +5089,15 @@ No more than one Corsair Baron may be assigned to any single unit, and a Cloud D
           </entryLinks>
         </selectionEntryGroup>
       </selectionEntryGroups>
-      <entryLinks/>
+      <entryLinks>
+        <entryLink id="253b-a34d-032b-fc20" name="New EntryLink" hidden="false" targetId="6fce-9698-40be-cf5e" type="selectionEntryGroup">
+          <profiles/>
+          <rules/>
+          <infoLinks/>
+          <modifiers/>
+          <constraints/>
+        </entryLink>
+      </entryLinks>
       <costs>
         <cost name="pts" costTypeId="points" value="0.0"/>
       </costs>
@@ -6388,7 +6404,15 @@ The controlling player may choose to have a Corsair Lynx deployed on the table i
           <entryLinks/>
         </selectionEntryGroup>
       </selectionEntryGroups>
-      <entryLinks/>
+      <entryLinks>
+        <entryLink id="06b3-7710-606a-6ae0" name="New EntryLink" hidden="false" targetId="6fce-9698-40be-cf5e" type="selectionEntryGroup">
+          <profiles/>
+          <rules/>
+          <infoLinks/>
+          <modifiers/>
+          <constraints/>
+        </entryLink>
+      </entryLinks>
       <costs>
         <cost name="pts" costTypeId="points" value="0.0"/>
       </costs>
@@ -6686,7 +6710,15 @@ The controlling player may choose to have a Corsair Lynx deployed on the table i
           <modifiers/>
         </infoLink>
       </infoLinks>
-      <modifiers/>
+      <modifiers>
+        <modifier type="set" field="hidden" value="true">
+          <repeats/>
+          <conditions>
+            <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f1c4-09e2-1971-7362" type="instanceOf"/>
+          </conditions>
+          <conditionGroups/>
+        </modifier>
+      </modifiers>
       <constraints/>
       <selectionEntries>
         <selectionEntry id="09d4-f485-c8b9-b7b7" name="Corsair Kinetic Shrouds" hidden="false" collective="false" categoryEntryId="(No Category)" type="upgrade">
@@ -6902,7 +6934,15 @@ In addition, Zooming Flyers of the Interceptor type always count as having the S
           <modifiers/>
         </infoLink>
       </infoLinks>
-      <modifiers/>
+      <modifiers>
+        <modifier type="set" field="hidden" value="true">
+          <repeats/>
+          <conditions>
+            <condition field="selections" scope="force" value="0.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="f1c4-09e2-1971-7362" type="instanceOf"/>
+          </conditions>
+          <conditionGroups/>
+        </modifier>
+      </modifiers>
       <constraints/>
       <selectionEntries>
         <selectionEntry id="4715-4ca4-abb5-c3c2" name="Corsair Kinetic Shroud" hidden="false" collective="false" categoryEntryId="(No Category)" type="upgrade">
@@ -7889,18 +7929,9 @@ In addition, Zooming Flyers of the Interceptor type always count as having the S
                   <profiles/>
                   <rules/>
                   <infoLinks/>
-                  <modifiers>
-                    <modifier type="increment" field="maxSelections" value="1.0">
-                      <repeats/>
-                      <conditions>
-                        <condition field="selections" scope="c585-e929-41db-275b" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="bf08-a9b4-dc7c-4cfe" type="atLeast"/>
-                      </conditions>
-                      <conditionGroups/>
-                    </modifier>
-                  </modifiers>
+                  <modifiers/>
                   <constraints>
                     <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="minSelections" type="min"/>
-                    <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="maxSelections" type="max"/>
                   </constraints>
                   <selectionEntries/>
                   <selectionEntryGroups>
@@ -7908,7 +7939,15 @@ In addition, Zooming Flyers of the Interceptor type always count as having the S
                       <profiles/>
                       <rules/>
                       <infoLinks/>
-                      <modifiers/>
+                      <modifiers>
+                        <modifier type="set" field="maxSelections" value="0.0">
+                          <repeats/>
+                          <conditions>
+                            <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5321-16cc-1fd6-43f7" type="equalTo"/>
+                          </conditions>
+                          <conditionGroups/>
+                        </modifier>
+                      </modifiers>
                       <constraints>
                         <constraint field="selections" scope="parent" value="2.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="maxSelections" type="max"/>
                       </constraints>
@@ -8019,12 +8058,33 @@ In addition, Zooming Flyers of the Interceptor type always count as having the S
                         <modifier type="set" field="minSelections" value="0.0">
                           <repeats/>
                           <conditions/>
-                          <conditionGroups/>
+                          <conditionGroups>
+                            <conditionGroup type="or">
+                              <conditions>
+                                <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="bf08-a9b4-dc7c-4cfe" type="atLeast"/>
+                                <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5321-16cc-1fd6-43f7" type="equalTo"/>
+                              </conditions>
+                              <conditionGroups/>
+                            </conditionGroup>
+                          </conditionGroups>
+                        </modifier>
+                        <modifier type="set" field="355f-3630-db8b-4fbb" value="0.0">
+                          <repeats/>
+                          <conditions/>
+                          <conditionGroups>
+                            <conditionGroup type="or">
+                              <conditions>
+                                <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="bf08-a9b4-dc7c-4cfe" type="atLeast"/>
+                                <condition field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5321-16cc-1fd6-43f7" type="equalTo"/>
+                              </conditions>
+                              <conditionGroups/>
+                            </conditionGroup>
+                          </conditionGroups>
                         </modifier>
                       </modifiers>
                       <constraints>
                         <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="minSelections" type="min"/>
-                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="maxSelections" type="max"/>
+                        <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" id="355f-3630-db8b-4fbb" type="max"/>
                       </constraints>
                       <selectionEntries>
                         <selectionEntry id="a7b3-b561-3bb8-cfd3" name="Lasblaster" hidden="false" collective="false" categoryEntryId="(No Category)" type="upgrade">
@@ -8102,7 +8162,14 @@ In addition, Zooming Flyers of the Interceptor type always count as having the S
                         <selectionEntry id="0951-04b8-6050-f2e1" name="CCW and Pistols" hidden="false" collective="false" categoryEntryId="(No Category)" type="upgrade">
                           <profiles/>
                           <rules/>
-                          <infoLinks/>
+                          <infoLinks>
+                            <infoLink id="dca1-c9fd-b609-d764" name="New InfoLink" hidden="false" targetId="e294-a5c7-e01e-0a82" type="profile">
+                              <profiles/>
+                              <rules/>
+                              <infoLinks/>
+                              <modifiers/>
+                            </infoLink>
+                          </infoLinks>
                           <modifiers/>
                           <constraints>
                             <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="maxSelections" type="max"/>
@@ -8138,33 +8205,7 @@ In addition, Zooming Flyers of the Interceptor type always count as having the S
                                 </infoLink>
                               </infoLinks>
                               <modifiers/>
-                              <constraints>
-                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="minSelections" type="min"/>
-                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="maxSelections" type="max"/>
-                              </constraints>
-                              <selectionEntries/>
-                              <selectionEntryGroups/>
-                              <entryLinks/>
-                              <costs>
-                                <cost name="pts" costTypeId="points" value="0.0"/>
-                              </costs>
-                            </selectionEntry>
-                            <selectionEntry id="dffb-02ba-1ff8-688d" name="Close Combat Weapon" hidden="false" collective="true" categoryEntryId="(No Category)" type="upgrade">
-                              <profiles/>
-                              <rules/>
-                              <infoLinks>
-                                <infoLink id="1159-385a-52e3-3a54" hidden="false" targetId="e294-a5c7-e01e-0a82" type="profile">
-                                  <profiles/>
-                                  <rules/>
-                                  <infoLinks/>
-                                  <modifiers/>
-                                </infoLink>
-                              </infoLinks>
-                              <modifiers/>
-                              <constraints>
-                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="minSelections" type="min"/>
-                                <constraint field="selections" scope="parent" value="1.0" percentValue="false" shared="false" includeChildSelections="false" includeChildForces="false" id="maxSelections" type="max"/>
-                              </constraints>
+                              <constraints/>
                               <selectionEntries/>
                               <selectionEntryGroups/>
                               <entryLinks/>
@@ -8188,9 +8229,11 @@ In addition, Zooming Flyers of the Interceptor type always count as having the S
                       <rules/>
                       <infoLinks/>
                       <modifiers>
-                        <modifier type="increment" field="maxSelections" value="1.0">
+                        <modifier type="increment" field="maxSelections" value="1">
                           <repeats/>
-                          <conditions/>
+                          <conditions>
+                            <condition field="selections" scope="6602-7acd-8055-3a88" value="5.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="model" type="atLeast"/>
+                          </conditions>
                           <conditionGroups/>
                         </modifier>
                       </modifiers>
@@ -8369,14 +8412,7 @@ In addition, Zooming Flyers of the Interceptor type always count as having the S
               <modifiers>
                 <modifier type="increment" field="maxSelections" value="2">
                   <repeats>
-                    <repeat field="selections" scope="6602-7acd-8055-3a88" value="5.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="ecc4-aad3-fa3a-e298" repeats="1"/>
-                  </repeats>
-                  <conditions/>
-                  <conditionGroups/>
-                </modifier>
-                <modifier type="decrement" field="maxSelections" value="1">
-                  <repeats>
-                    <repeat field="selections" scope="ecc4-aad3-fa3a-e298" value="1.0" percentValue="false" shared="true" includeChildSelections="false" includeChildForces="false" childId="5321-16cc-1fd6-43f7" repeats="1"/>
+                    <repeat field="selections" scope="6602-7acd-8055-3a88" value="5.0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="ecc4-aad3-fa3a-e298" repeats="1"/>
                   </repeats>
                   <conditions/>
                   <conditionGroups/>
@@ -8862,6 +8898,13 @@ In addition, Zooming Flyers of the Interceptor type always count as having the S
           <modifiers/>
           <constraints/>
         </entryLink>
+        <entryLink id="6036-ea6c-3e24-dda5" name="New EntryLink" hidden="false" targetId="6fce-9698-40be-cf5e" type="selectionEntryGroup">
+          <profiles/>
+          <rules/>
+          <infoLinks/>
+          <modifiers/>
+          <constraints/>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="pts" costTypeId="points" value="0.0"/>
@@ -10638,6 +10681,13 @@ During the Dogfight phase, if a player has any Air Leviathan in Reserves or Ongo
           </modifiers>
           <constraints/>
         </entryLink>
+        <entryLink id="03f4-630b-35bd-df8e" name="New EntryLink" hidden="false" targetId="6fce-9698-40be-cf5e" type="selectionEntryGroup">
+          <profiles/>
+          <rules/>
+          <infoLinks/>
+          <modifiers/>
+          <constraints/>
+        </entryLink>
       </entryLinks>
       <costs>
         <cost name="pts" costTypeId="points" value="-10.0"/>