diff --git a/2022 - Legiones Astartes.cat b/2022 - Legiones Astartes.cat
index 487c698f..b2660997 100644
--- a/2022 - Legiones Astartes.cat	
+++ b/2022 - Legiones Astartes.cat	
@@ -16090,15 +16090,15 @@ This is a Damage Mitigation roll – any model may make only a single Damage Mit
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
                   </costs>
                 </entryLink>
-                <entryLink id="f743-6785-dfa6-d7c7" name="Berserker" hidden="false" collective="false" import="true" targetId="93af-e204-255b-b095" type="selectionEntry">
+                <entryLink id="f743-6785-dfa6-d7c7" name="Berserker" hidden="true" collective="false" import="true" targetId="93af-e204-255b-b095" type="selectionEntry">
                   <modifiers>
-                    <modifier type="set" field="hidden" value="true">
+                    <modifier type="set" field="hidden" value="false">
                       <conditionGroups>
-                        <conditionGroup type="or">
+                        <conditionGroup type="and">
                           <conditions>
-                            <condition field="selections" scope="25a2-7a52-632a-6b2c" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8846-2f93-a2be-18dc" type="equalTo"/>
-                            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="90ee-77dd-1b7f-ddfe" type="equalTo"/>
-                            <condition field="selections" scope="25a2-7a52-632a-6b2c" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d332-0e64-7ecf-6c35" type="equalTo"/>
+                            <condition field="selections" scope="25a2-7a52-632a-6b2c" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8846-2f93-a2be-18dc" type="equalTo"/>
+                            <condition field="selections" scope="force" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="90ee-77dd-1b7f-ddfe" type="equalTo"/>
+                            <condition field="selections" scope="25a2-7a52-632a-6b2c" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d332-0e64-7ecf-6c35" type="equalTo"/>
                           </conditions>
                         </conditionGroup>
                       </conditionGroups>
@@ -26735,15 +26735,15 @@ If one or more Wounds is discounted due to this special rule, and the unit that
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
                   </costs>
                 </entryLink>
-                <entryLink id="2143-394a-205e-8e9a" name="Berserker" hidden="false" collective="false" import="true" targetId="93af-e204-255b-b095" type="selectionEntry">
+                <entryLink id="2143-394a-205e-8e9a" name="Berserker" hidden="true" collective="false" import="true" targetId="93af-e204-255b-b095" type="selectionEntry">
                   <modifiers>
-                    <modifier type="set" field="hidden" value="true">
+                    <modifier type="set" value="false" field="hidden">
                       <conditionGroups>
-                        <conditionGroup type="or">
+                        <conditionGroup type="and">
                           <conditions>
-                            <condition field="selections" scope="3766-ea98-0aa7-62d0" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8846-2f93-a2be-18dc" type="equalTo"/>
-                            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="90ee-77dd-1b7f-ddfe" type="equalTo"/>
-                            <condition field="selections" scope="3766-ea98-0aa7-62d0" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d332-0e64-7ecf-6c35" type="equalTo"/>
+                            <condition type="equalTo" value="0" field="selections" scope="3766-ea98-0aa7-62d0" childId="8846-2f93-a2be-18dc" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                            <condition type="equalTo" value="1" field="selections" scope="force" childId="90ee-77dd-1b7f-ddfe" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                            <condition type="equalTo" value="0" field="selections" scope="3766-ea98-0aa7-62d0" childId="d332-0e64-7ecf-6c35" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                           </conditions>
                         </conditionGroup>
                       </conditionGroups>
@@ -32762,15 +32762,15 @@ If one or more Wounds is discounted due to this special rule, and the unit that
                     <cost name="Pts" typeId="d2ee-04cb-5f8a-2642" value="15"/>
                   </costs>
                 </entryLink>
-                <entryLink id="177f-ff00-9d1c-5cbe" name="Berserker" hidden="false" collective="false" import="true" targetId="93af-e204-255b-b095" type="selectionEntry">
+                <entryLink id="177f-ff00-9d1c-5cbe" name="Berserker" hidden="true" collective="false" import="true" targetId="93af-e204-255b-b095" type="selectionEntry">
                   <modifiers>
-                    <modifier type="set" field="hidden" value="true">
+                    <modifier type="set" value="false" field="hidden">
                       <conditionGroups>
-                        <conditionGroup type="or">
+                        <conditionGroup type="and">
                           <conditions>
-                            <condition field="selections" scope="f806-8a4e-d0d6-beaa" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="8846-2f93-a2be-18dc" type="equalTo"/>
-                            <condition field="selections" scope="force" value="0" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="90ee-77dd-1b7f-ddfe" type="equalTo"/>
-                            <condition field="selections" scope="f806-8a4e-d0d6-beaa" value="1" percentValue="false" shared="true" includeChildSelections="true" includeChildForces="false" childId="d332-0e64-7ecf-6c35" type="equalTo"/>
+                            <condition type="equalTo" value="0" field="selections" scope="f806-8a4e-d0d6-beaa" childId="8846-2f93-a2be-18dc" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                            <condition type="equalTo" value="1" field="selections" scope="force" childId="90ee-77dd-1b7f-ddfe" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                            <condition type="equalTo" value="0" field="selections" scope="f806-8a4e-d0d6-beaa" childId="d332-0e64-7ecf-6c35" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
                           </conditions>
                         </conditionGroup>
                       </conditionGroups>
@@ -63175,7 +63175,19 @@ If the Psychic check is successful then until that Shooting Attack is resolved,
                     <cost name="Pts" id="f7cc-e9b7-b373-c303" hidden="false" typeId="d2ee-04cb-5f8a-2642" value="15"/>
                   </costs>
                 </entryLink>
-                <entryLink import="true" name="Berserker" hidden="true" id="ea83-2261-7a0b-ad10" collective="false" targetId="93af-e204-255b-b095" type="selectionEntry"/>
+                <entryLink import="true" name="Berserker" hidden="true" id="ea83-2261-7a0b-ad10" collective="false" targetId="93af-e204-255b-b095" type="selectionEntry">
+                  <modifiers>
+                    <modifier type="set" value="false" field="hidden">
+                      <conditionGroups>
+                        <conditionGroup type="and">
+                          <conditions>
+                            <condition type="equalTo" value="1" field="selections" scope="force" childId="90ee-77dd-1b7f-ddfe" shared="true" percentValue="false" includeChildSelections="true" includeChildForces="false"/>
+                          </conditions>
+                        </conditionGroup>
+                      </conditionGroups>
+                    </modifier>
+                  </modifiers>
+                </entryLink>
                 <entryLink import="true" name="Vigil Storm Shield" hidden="false" id="cc3-6a34-5570-f4db" collective="false" targetId="ec3d-1f0c-d195-a006" type="selectionEntry">
                   <constraints>
                     <constraint type="max" value="1" field="selections" scope="parent" shared="true" id="41d6-acf0-4567-341" percentValue="false" includeChildSelections="false" includeChildForces="false"/>