diff --git a/gamedir/Data-1.13/BigItems/P1ITEM921.sti b/gamedir/Data-1.13/BigItems/P1ITEM921.sti
new file mode 100644
index 000000000..87e3b89f1
Binary files /dev/null and b/gamedir/Data-1.13/BigItems/P1ITEM921.sti differ
diff --git a/gamedir/Data-1.13/TableData/Items/Attachments.xml b/gamedir/Data-1.13/TableData/Items/Attachments.xml
index 44eb56aa8..48c6c13df 100644
--- a/gamedir/Data-1.13/TableData/Items/Attachments.xml
+++ b/gamedir/Data-1.13/TableData/Items/Attachments.xml
@@ -29528,6 +29528,11 @@
 		<itemIndex>1773</itemIndex>
 		<APCost>20</APCost>
 	</ATTACHMENT>
+	<ATTACHMENT>
+		<attachmentIndex>1765</attachmentIndex>
+		<itemIndex>1774</itemIndex>
+		<APCost>20</APCost>
+	</ATTACHMENT>
 	<ATTACHMENT>
 		<attachmentIndex>1766</attachmentIndex>
 		<itemIndex>170</itemIndex>
diff --git a/gamedir/Data-1.13/TableData/Items/Items.xml b/gamedir/Data-1.13/TableData/Items/Items.xml
index 8aea5e789..33d2723b9 100644
--- a/gamedir/Data-1.13/TableData/Items/Items.xml
+++ b/gamedir/Data-1.13/TableData/Items/Items.xml
@@ -53013,4 +53013,33 @@
 		<CROUCH_MODIFIERS />
 		<PRONE_MODIFIERS />
 	</ITEM>
+	<ITEM>
+		<uiIndex>1774</uiIndex>
+		<szItemName>Army Cap</szItemName>
+		<szLongItemName>Army Cap</szLongItemName>
+		<szItemDesc>A lightweight field cap.</szItemDesc>
+		<szBRName>Army Cap</szBRName>
+		<szBRDesc>This practical and comfortable patrol cap is a stylish choice for both leisure activities and paramilitary outings. Available in a wide range of different colors.</szBRDesc>
+		<usItemClass>2048</usItemClass>
+		<nasLayoutClass>1</nasLayoutClass>
+		<ubClassIndex>42</ubClassIndex>
+		<ubGraphicType>1</ubGraphicType>
+		<ubGraphicNum>921</ubGraphicNum>
+		<ubWeight>1</ubWeight>
+		<ubPerPocket>1</ubPerPocket>
+		<ItemSize>15</ItemSize>
+		<usPrice>15</usPrice>
+		<ubCoolness>1</ubCoolness>
+		<BR_NewInventory>5</BR_NewInventory>
+		<BR_UsedInventory>1</BR_UsedInventory>
+		<usOverheatingCooldownFactor>100</usOverheatingCooldownFactor>
+		<Damageable>1</Damageable>
+		<Repairable>1</Repairable>
+		<Sinks>1</Sinks>
+		<ShowStatus>1</ShowStatus>
+		<BigGunList>1</BigGunList>
+		<STAND_MODIFIERS />
+		<CROUCH_MODIFIERS />
+		<PRONE_MODIFIERS />
+	</ITEM>
 </ITEMLIST>
\ No newline at end of file
diff --git a/gamedir/Data/TableData/LogicalBodyTypes/Filters.xml b/gamedir/Data/TableData/LogicalBodyTypes/Filters.xml
index 0ea9361f6..b40b1a15b 100644
--- a/gamedir/Data/TableData/LogicalBodyTypes/Filters.xml
+++ b/gamedir/Data/TableData/LogicalBodyTypes/Filters.xml
@@ -165,6 +165,12 @@
 			<HELMETPOSATTACHMENT3 op="in">1197</HELMETPOSATTACHMENT3>
 		</OR>
 	</Filter>
+	<Filter name="GhillieHoodAndPistolLeft">
+		<AND>
+			<FILTER>GhillieHood</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="GhillieHoodAndPistol">
 		<AND>
 			<FILTER>GhillieHood</FILTER>
@@ -377,22 +383,22 @@
 	</Filter>
 	<Filter name="Longsleeves">
 		<AND>
-			<VESTPOS op="in">840, 856, 857, 858, 859, 860, 865, 866, 867, 868, 869</VESTPOS>
+			<VESTPOS op="in">188, 189, 840, 856, 857, 858, 859, 860, 865, 866, 867, 868, 869</VESTPOS>
 		</AND>
 	</Filter>
-	<Filter name="LongsleevesANDHasPistolOrMPistolInLeftHand">
+	<Filter name="LongsleevesAndPistolLeft">
 		<AND>
 			<FILTER>Longsleeves</FILTER>
 			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="LongsleevesANDHasPistolOrMPistolInRightHand">
+	<Filter name="LongsleevesAndPistol">
 		<AND>
 			<FILTER>Longsleeves</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="LongsleevesANDHasRifleTypeWeaponInHand">
+	<Filter name="LongsleevesAndRifle">
 		<AND>
 			<FILTER>Longsleeves</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
@@ -413,6 +419,12 @@
 			<VESTPOSATTACHMENT3 op="in">286</VESTPOSATTACHMENT3>
 		</OR>
 	</Filter>
+	<Filter name="DressUniformVestAndPistolLeft">
+		<AND>
+			<FILTER>DressUniformVest</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="DressUniformVestAndPistol">
 		<AND>
 			<FILTER>DressUniformVest</FILTER>
@@ -440,6 +452,12 @@
 			<VESTPOSATTACHMENT3 op="in">286</VESTPOSATTACHMENT3>
 		</OR>
 	</Filter>
+	<Filter name="DressUniformPantsAndPistolLeft">
+		<AND>
+			<FILTER>DressUniformPants</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="DressUniformPantsAndPistol">
 		<AND>
 			<FILTER>DressUniformPants</FILTER>
@@ -463,6 +481,12 @@
 			<LEGPOS op="in">170, 171, 172</LEGPOS>
 		</AND>
 	</Filter>
+	<Filter name="KevlarLeggingsAndPistolLeft">
+		<AND>
+			<FILTER>KevlarLeggings</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="KevlarLeggingsAndPistol">
 		<AND>
 			<FILTER>KevlarLeggings</FILTER>
@@ -486,6 +510,12 @@
 			<LEGPOS op="in">173, 174, 175</LEGPOS>
 		</AND>
 	</Filter>
+	<Filter name="SpectraLeggingsAndPistolLeft">
+		<AND>
+			<FILTER>SpectraLeggings</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="SpectraLeggingsAndPistol">
 		<AND>
 			<FILTER>SpectraLeggings</FILTER>
@@ -509,6 +539,12 @@
 			<LEGPOS op="in">811, 823, 835</LEGPOS>
 		</AND>
 	</Filter>
+	<Filter name="TwaronLeggingsAndPistolLeft">
+		<AND>
+			<FILTER>TwaronLeggings</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="TwaronLeggingsAndPistol">
 		<AND>
 			<FILTER>TwaronLeggings</FILTER>
@@ -532,6 +568,12 @@
 			<LEGPOS op="in">802, 814, 826</LEGPOS>
 		</AND>
 	</Filter>
+	<Filter name="DyneemaLeggingsAndPistolLeft">
+		<AND>
+			<FILTER>DyneemaLeggings</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="DyneemaLeggingsAndPistol">
 		<AND>
 			<FILTER>DyneemaLeggings</FILTER>
@@ -555,6 +597,12 @@
 			<LEGPOS op="in">294</LEGPOS>
 		</AND>
 	</Filter>
+	<Filter name="SWATLeggingsAndPistolLeft">
+		<AND>
+			<FILTER>SWATLeggings</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="SWATLeggingsAndPistol">
 		<AND>
 			<FILTER>SWATLeggings</FILTER>
@@ -578,6 +626,12 @@
 			<LEGPOS op="in">282</LEGPOS>
 		</AND>
 	</Filter>
+	<Filter name="ZylonPantsAndPistolLeft">
+		<AND>
+			<FILTER>ZylonPants</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="ZylonPantsAndPistol">
 		<AND>
 			<FILTER>ZylonPants</FILTER>
@@ -596,49 +650,61 @@
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingHelmet">
+	<Filter name="Helmet">
 		<OR>
 			<HELMETPOS op="in">302, 839, 1100, 1135</HELMETPOS>
 		</OR>
 	</Filter>
-	<Filter name="IsWearingHelmetAndHasPistol">
+	<Filter name="HelmetAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingHelmet</FILTER>
+			<FILTER>Helmet</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="HelmetAndPistol">
+		<AND>
+			<FILTER>Helmet</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingHelmetAndHasRifle">
+	<Filter name="HelmetAndRifle">
 		<AND>
-			<FILTER>IsWearingHelmet</FILTER>
+			<FILTER>Helmet</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="HelmetAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingHelmet</FILTER>
+			<FILTER>Helmet</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingCamoHelmet">
+	<Filter name="CamoHelmet">
 		<AND>
 			<HELMETPOS op="in">302, 839, 1100, 1135</HELMETPOS>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingCamoHelmetAndHasPistol">
+	<Filter name="CamoHelmetAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingCamoHelmet</FILTER>
+			<FILTER>CamoHelmet</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="CamoHelmetAndPistol">
+		<AND>
+			<FILTER>CamoHelmet</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingCamoHelmetAndHasRifle">
+	<Filter name="CamoHelmetAndRifle">
 		<AND>
-			<FILTER>IsWearingCamoHelmet</FILTER>
+			<FILTER>CamoHelmet</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="CamoHelmetAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingCamoHelmet</FILTER>
+			<FILTER>CamoHelmet</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
@@ -647,6 +713,12 @@
 			<HELMETPOS op="in">176</HELMETPOS>
 		</AND>
 	</Filter>
+	<Filter name="SteelHelmetAndPistolLeft">
+		<AND>
+			<FILTER>SteelHelmet</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="SteelHelmetAndPistol">
 		<AND>
 			<FILTER>SteelHelmet</FILTER>
@@ -670,6 +742,12 @@
 			<HELMETPOS op="in">177, 178, 179</HELMETPOS>
 		</AND>
 	</Filter>
+	<Filter name="KevlarHelmetAndPistolLeft">
+		<AND>
+			<FILTER>KevlarHelmet</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="KevlarHelmetAndPistol">
 		<AND>
 			<FILTER>KevlarHelmet</FILTER>
@@ -693,6 +771,12 @@
 			<HELMETPOS op="in">293, 819, 831</HELMETPOS>
 		</AND>
 	</Filter>
+	<Filter name="SWATHelmetAndPistolLeft">
+		<AND>
+			<FILTER>SWATHelmet</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="SWATHelmetAndPistol">
 		<AND>
 			<FILTER>SWATHelmet</FILTER>
@@ -716,6 +800,12 @@
 			<HELMETPOS op="in">180, 181, 182</HELMETPOS>
 		</AND>
 	</Filter>
+	<Filter name="SpectraHelmetAndPistolLeft">
+		<AND>
+			<FILTER>SpectraHelmet</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="SpectraHelmetAndPistol">
 		<AND>
 			<FILTER>SpectraHelmet</FILTER>
@@ -739,6 +829,12 @@
 			<HELMETPOS op="in">810, 822, 834</HELMETPOS>
 		</AND>
 	</Filter>
+	<Filter name="TwaronHelmetAndPistolLeft">
+		<AND>
+			<FILTER>TwaronHelmet</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="TwaronHelmetAndPistol">
 		<AND>
 			<FILTER>TwaronHelmet</FILTER>
@@ -762,6 +858,12 @@
 			<HELMETPOS op="in">801, 813, 825</HELMETPOS>
 		</AND>
 	</Filter>
+	<Filter name="DyneemaHelmetAndPistolLeft">
+		<AND>
+			<FILTER>DyneemaHelmet</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="DyneemaHelmetAndPistol">
 		<AND>
 			<FILTER>DyneemaHelmet</FILTER>
@@ -780,7 +882,7 @@
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="HasKneepads">
+	<Filter name="Kneepads">
 		<OR>
 			<LEGPOS op="in">838</LEGPOS>
 			<LEGPOSATTACHMENT0 op="in">838</LEGPOSATTACHMENT0>
@@ -789,21 +891,27 @@
 			<LEGPOSATTACHMENT3 op="in">838</LEGPOSATTACHMENT3>
 		</OR>
 	</Filter>
-	<Filter name="HasKneepadsAndHasPistol">
+	<Filter name="KneepadsAndPistolLeft">
 		<AND>
-			<FILTER>HasKneepads</FILTER>
+			<FILTER>Kneepads</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="KneepadsAndPistol">
+		<AND>
+			<FILTER>Kneepads</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="HasKneepadsAndHasRifle">
+	<Filter name="KneepadsAndRifle">
 		<AND>
-			<FILTER>HasKneepads</FILTER>
+			<FILTER>Kneepads</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="KneepadsAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>HasKneepads</FILTER>
+			<FILTER>Kneepads</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
@@ -812,13 +920,19 @@
 			<RTHIGHPOCKPOS op="in">1091, 1092, 1093</RTHIGHPOCKPOS>
 		</AND>
 	</Filter>
-	<Filter name="HasHolsterAndPistol">
+	<Filter name="HolsterAndPistolLeft">
+		<AND>
+			<FILTER>Holster</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="HolsterAndPistol">
 		<AND>
 			<FILTER>Holster</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="HasHolsterAndRifle">
+	<Filter name="HolsterAndRifle">
 		<AND>
 			<FILTER>Holster</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
@@ -830,48 +944,54 @@
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="HolsterLeft">
+	<Filter name="LeftHolster">
 		<AND>
 			<LTHIGHPOCKPOS op="in">1091, 1092, 1093</LTHIGHPOCKPOS>
 		</AND>
 	</Filter>
-	<Filter name="HasLeftHolsterAndPistol">
+	<Filter name="LeftHolsterAndPistolLeft">
 		<AND>
-			<FILTER>HolsterLeft</FILTER>
+			<FILTER>LeftHolster</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="LeftHolsterAndPistol">
+		<AND>
+			<FILTER>LeftHolster</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="HasLeftHolsterAndRifle">
+	<Filter name="LeftHolsterAndRifle">
 		<AND>
-			<FILTER>HolsterLeft</FILTER>
+			<FILTER>LeftHolster</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="LeftHolsterAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>HolsterLeft</FILTER>
+			<FILTER>LeftHolster</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 <!--
-	<Filter name="IsWearingBigRadioSet">
+	<Filter name="BigRadioSet">
 		<OR>
 			<CPACKPOCKPOS op="in"></CPACKPOCKPOS>
 		</OR>
 	</Filter>
 -->
-	<Filter name="IsWearingMedRadioSet">
+	<Filter name="MedRadioSet">
 		<AND>
 			<CPACKPOCKPOS op="in">1697</CPACKPOCKPOS>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingCombatPack">
+	<Filter name="CombatPack">
 		<AND>
 			<CPACKPOCKPOS op="in">1097, 1098, 1099, 1706, 1708</CPACKPOCKPOS>
 			<WEARING_BACKPACK>0</WEARING_BACKPACK>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingBackpack">
+	<Filter name="Backpack">
 		<OR>
 			<WEARING_BACKPACK>1</WEARING_BACKPACK>
 		</OR>
@@ -2889,191 +3009,245 @@
 		</AND>
 	</Filter>
 <!--
-	<Filter name="IsWearingBigRadioSetAndHasPistol">
+	<Filter name="BigRadioSetAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingBigRadioSet</FILTER>
+			<FILTER>BigRadioSet</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="BigRadioSetAndPistol">
+		<AND>
+			<FILTER>BigRadioSet</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingBigRadioSetAndHasRifle">
+	<Filter name="BigRadioSetAndRifle">
 		<AND>
-			<FILTER>IsWearingBigRadioSet</FILTER>
+			<FILTER>BigRadioSet</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="BigRadioSetAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingBigRadioSet</FILTER>
+			<FILTER>BigRadioSet</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 -->
-	<Filter name="IsWearingMedRadioSetAndHasPistol">
+	<Filter name="MedRadioSetAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingMedRadioSet</FILTER>
+			<FILTER>MedRadioSet</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="MedRadioSetAndPistol">
+		<AND>
+			<FILTER>MedRadioSet</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingMedRadioSetAndHasRifle">
+	<Filter name="MedRadioSetAndRifle">
 		<AND>
-			<FILTER>IsWearingMedRadioSet</FILTER>
+			<FILTER>MedRadioSet</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="MedRadioSetAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingMedRadioSet</FILTER>
+			<FILTER>MedRadioSet</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingCombatPackAndHasPistol">
+	<Filter name="CombatPackAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingCombatPack</FILTER>
+			<FILTER>CombatPack</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="CombatPackAndPistol">
+		<AND>
+			<FILTER>CombatPack</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingCombatPackAndHasRifle">
+	<Filter name="CombatPackAndRifle">
 		<AND>
-			<FILTER>IsWearingCombatPack</FILTER>
+			<FILTER>CombatPack</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="CombatPackAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingCombatPack</FILTER>
+			<FILTER>CombatPack</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingBackpackAndHasPistol">
+	<Filter name="BackpackAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingBackpack</FILTER>
+			<FILTER>Backpack</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="BackpackAndPistol">
+		<AND>
+			<FILTER>Backpack</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingBackpackAndHasRifle">
+	<Filter name="BackpackAndRifle">
 		<AND>
-			<FILTER>IsWearingBackpack</FILTER>
+			<FILTER>Backpack</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="BackpackAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingBackpack</FILTER>
+			<FILTER>Backpack</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingRedBeret">
+	<Filter name="RedBeret">
 		<AND>
 			<HELMETPOS op="in">288</HELMETPOS>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingRedBeretAndHasPistol">
+	<Filter name="RedBeretAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingRedBeret</FILTER>
+			<FILTER>RedBeret</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="RedBeretAndPistol">
+		<AND>
+			<FILTER>RedBeret</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingRedBeretAndHasRifle">
+	<Filter name="RedBeretAndRifle">
 		<AND>
-			<FILTER>IsWearingRedBeret</FILTER>
+			<FILTER>RedBeret</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="RedBeretAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingRedBeret</FILTER>
+			<FILTER>RedBeret</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingGreenBeret">
+	<Filter name="GreenBeret">
 		<AND>
 			<HELMETPOS op="in">1771</HELMETPOS>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingGreenBeretAndHasPistol">
+	<Filter name="GreenBeretAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingGreenBeret</FILTER>
+			<FILTER>GreenBeret</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="GreenBeretAndPistol">
+		<AND>
+			<FILTER>GreenBeret</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingGreenBeretAndHasRifle">
+	<Filter name="GreenBeretAndRifle">
 		<AND>
-			<FILTER>IsWearingGreenBeret</FILTER>
+			<FILTER>GreenBeret</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="GreenBeretAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingGreenBeret</FILTER>
+			<FILTER>GreenBeret</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingBlueBeret">
+	<Filter name="BlueBeret">
 		<AND>
 			<HELMETPOS op="in">1772</HELMETPOS>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingBlueBeretAndHasPistol">
+	<Filter name="BlueBeretAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingBlueBeret</FILTER>
+			<FILTER>BlueBeret</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="BlueBeretAndPistol">
+		<AND>
+			<FILTER>BlueBeret</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingBlueBeretAndHasRifle">
+	<Filter name="BlueBeretAndRifle">
 		<AND>
-			<FILTER>IsWearingBlueBeret</FILTER>
+			<FILTER>BlueBeret</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="BlueBeretAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingBlueBeret</FILTER>
+			<FILTER>BlueBeret</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingHat">
+	<Filter name="BooneyHat">
 		<AND>
 			<HELMETPOS op="in">285</HELMETPOS>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingHatAndHasPistol">
+	<Filter name="BooneyHatAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingHat</FILTER>
+			<FILTER>BooneyHat</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="BooneyHatAndPistol">
+		<AND>
+			<FILTER>BooneyHat</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingHatAndHasRifle">
+	<Filter name="BooneyHatAndRifle">
 		<AND>
-			<FILTER>IsWearingHat</FILTER>
+			<FILTER>BooneyHat</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="HatAndBluntMeleeWeapon">
+	<Filter name="BooneyHatAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingHat</FILTER>
+			<FILTER>BooneyHat</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingBallcap">
+	<Filter name="Ballcap">
 		<AND>
-			<HELMETPOS op="in">292</HELMETPOS>
+			<HELMETPOS op="in">1774</HELMETPOS>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingBallcapAndHasPistol">
+	<Filter name="BallcapAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingBallcap</FILTER>
+			<FILTER>Ballcap</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="BallcapAndPistol">
+		<AND>
+			<FILTER>Ballcap</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingBallcapAndHasRifle">
+	<Filter name="BallcapAndRifle">
 		<AND>
-			<FILTER>IsWearingBallcap</FILTER>
+			<FILTER>Ballcap</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="BallcapAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingBallcap</FILTER>
+			<FILTER>Ballcap</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
@@ -3086,13 +3260,19 @@
 			<HELMETPOSATTACHMENT3 op="in">1765</HELMETPOSATTACHMENT3>
 		</OR>
 	</Filter>
-	<Filter name="IsWearingBalaclavaAndHasPistol">
+	<Filter name="BalaclavaAndPistolLeft">
+		<AND>
+			<FILTER>Balaclava</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="BalaclavaAndPistol">
 		<AND>
 			<FILTER>Balaclava</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingBalaclavaAndHasRifle">
+	<Filter name="BalaclavaAndRifle">
 		<AND>
 			<FILTER>Balaclava</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
@@ -3109,6 +3289,12 @@
 			<HELMETPOS op="in">290</HELMETPOS>
 		</AND>
 	</Filter>
+	<Filter name="FurHatAndPistolLeft">
+		<AND>
+			<FILTER>FurHat</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="FurHatAndPistol">
 		<AND>
 			<FILTER>FurHat</FILTER>
@@ -3132,6 +3318,12 @@
 			<HELMETPOS op="in">287</HELMETPOS>
 		</AND>
 	</Filter>
+	<Filter name="USOfficerHatAndPistolLeft">
+		<AND>
+			<FILTER>USOfficerHat</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="USOfficerHatAndPistol">
 		<AND>
 			<FILTER>USOfficerHat</FILTER>
@@ -3155,6 +3347,12 @@
 			<HELMETPOS op="in">292</HELMETPOS>
 		</AND>
 	</Filter>
+	<Filter name="USSROfficerHatAndPistolLeft">
+		<AND>
+			<FILTER>USSROfficerHat</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="USSROfficerHatAndPistol">
 		<AND>
 			<FILTER>USSROfficerHat</FILTER>
@@ -3178,6 +3376,12 @@
 			<HELMETPOS op="in">289</HELMETPOS>
 		</AND>
 	</Filter>
+	<Filter name="RussianCapAndPistolLeft">
+		<AND>
+			<FILTER>RussianCap</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="RussianCapAndPistol">
 		<AND>
 			<FILTER>RussianCap</FILTER>
@@ -3201,6 +3405,12 @@
 			<HELMETPOS op="in">281</HELMETPOS>
 		</AND>
 	</Filter>
+	<Filter name="BlackCapAndPistolLeft">
+		<AND>
+			<FILTER>BlackCap</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="BlackCapAndPistol">
 		<AND>
 			<FILTER>BlackCap</FILTER>
@@ -3224,6 +3434,12 @@
 			<HELMETPOS op="in">1773</HELMETPOS>
 		</AND>
 	</Filter>
+	<Filter name="CowboyHatAndPistolLeft">
+		<AND>
+			<FILTER>CowboyHat</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="CowboyHatAndPistol">
 		<AND>
 			<FILTER>CowboyHat</FILTER>
@@ -3242,26 +3458,32 @@
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="FlakJacket">
+	<Filter name="ChestRig">
 		<OR>
 			<VESTPOS op="in">840</VESTPOS>
 		</OR>
 	</Filter>
-	<Filter name="IsWearingFlakJacketAndHasPistol">
+	<Filter name="ChestRigAndPistolLeft">
 		<AND>
-			<FILTER>FlakJacket</FILTER>
+			<FILTER>ChestRig</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="ChestRigAndPistol">
+		<AND>
+			<FILTER>ChestRig</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingFlakJacketAndHasRifle">
+	<Filter name="ChestRigAndRifle">
 		<AND>
-			<FILTER>FlakJacket</FILTER>
+			<FILTER>ChestRig</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="FlakJacketAndBluntMeleeWeapon">
+	<Filter name="ChestRigAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>FlakJacket</FILTER>
+			<FILTER>ChestRig</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
@@ -3270,13 +3492,19 @@
 			<VESTPOS op="in">164, 165, 166, 842, 843, 844, 847, 848, 849, 856, 857, 858, 865, 866, 867, 1103, 1104, 1105, 1108, 1109, 1110, 1117, 1118, 1119, 1126, 1127, 1128, 1138, 1139, 1140, 1143, 1144, 1145, 1152, 1153, 1154, 1161, 1162, 1163</VESTPOS>
 		</OR>
 	</Filter>
-	<Filter name="IsWearingKevlarVestAndHasPistol">
+	<Filter name="KevlarVestAndPistolLeft">
+		<AND>
+			<FILTER>KevlarVest</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="KevlarVestAndPistol">
 		<AND>
 			<FILTER>KevlarVest</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingKevlarVestAndHasRifle">
+	<Filter name="KevlarVestAndRifle">
 		<AND>
 			<FILTER>KevlarVest</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
@@ -3293,13 +3521,19 @@
 			<VESTPOS op="in">167, 168, 169, 818, 830, 850, 851, 859, 860, 868, 869, 1111, 1112, 1120, 1121, 1129, 1130, 1146, 1147, 1155, 1156, 1164, 1165</VESTPOS>
 		</OR>
 	</Filter>
-	<Filter name="IsWearingSpectraVestAndHasPistol">
+	<Filter name="SpectraVestAndPistolLeft">
+		<AND>
+			<FILTER>SpectraVest</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="SpectraVestAndPistol">
 		<AND>
 			<FILTER>SpectraVest</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingSpectraVestAndHasRifle">
+	<Filter name="SpectraVestAndRifle">
 		<AND>
 			<FILTER>SpectraVest</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
@@ -3316,6 +3550,12 @@
 			<VESTPOS op="in">161, 162, 163</VESTPOS>
 		</OR>
 	</Filter>
+	<Filter name="FlakVestAndPistolLeft">
+		<AND>
+			<FILTER>FlakVest</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="FlakVestAndPistol">
 		<AND>
 			<FILTER>FlakVest</FILTER>
@@ -3339,6 +3579,12 @@
 			<VESTPOS op="in">196, 197, 198</VESTPOS>
 		</OR>
 	</Filter>
+	<Filter name="GuardianVestAndPistolLeft">
+		<AND>
+			<FILTER>GuardianVest</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="GuardianVestAndPistol">
 		<AND>
 			<FILTER>GuardianVest</FILTER>
@@ -3362,6 +3608,12 @@
 			<VESTPOS op="in">295, 821, 833</VESTPOS>
 		</OR>
 	</Filter>
+	<Filter name="SWATVestAndPistolLeft">
+		<AND>
+			<FILTER>SWATVest</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="SWATVestAndPistol">
 		<AND>
 			<FILTER>SWATVest</FILTER>
@@ -3385,6 +3637,12 @@
 			<VESTPOS op="in">283</VESTPOS>
 		</OR>
 	</Filter>
+	<Filter name="ZylonVestAndPistolLeft">
+		<AND>
+			<FILTER>ZylonVest</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="ZylonVestAndPistol">
 		<AND>
 			<FILTER>ZylonVest</FILTER>
@@ -3408,6 +3666,12 @@
 			<VESTPOS op="in">812, 824, 836</VESTPOS>
 		</OR>
 	</Filter>
+	<Filter name="TwaronVestAndPistolLeft">
+		<AND>
+			<FILTER>TwaronVest</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="TwaronVestAndPistol">
 		<AND>
 			<FILTER>TwaronVest</FILTER>
@@ -3431,6 +3695,12 @@
 			<VESTPOS op="in">803, 815, 827</VESTPOS>
 		</OR>
 	</Filter>
+	<Filter name="DyneemaVestAndPistolLeft">
+		<AND>
+			<FILTER>DyneemaVest</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="DyneemaVestAndPistol">
 		<AND>
 			<FILTER>DyneemaVest</FILTER>
@@ -3464,6 +3734,12 @@
 			<HELMETPOS op="in">804, 816, 828</HELMETPOS>
 		</OR>
 	</Filter>
+	<Filter name="EODvestAndPistolLeft">
+		<AND>
+			<FILTER>EODvest</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="EODvestAndPistol">
 		<AND>
 			<FILTER>EODvest</FILTER>
@@ -3506,6 +3782,12 @@
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
+	<Filter name="EODhelmetAndPistolLeft">
+		<AND>
+			<FILTER>EODhelmet</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="EODhelmetAndPistol">
 		<AND>
 			<FILTER>EODhelmet</FILTER>
@@ -3537,51 +3819,63 @@
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingGasmask">
+	<Filter name="Gasmask">
 		<OR>
 			<HEAD1POS op="in">213</HEAD1POS>
 			<HEAD2POS op="in">213</HEAD2POS>
 		</OR>
 	</Filter>
-	<Filter name="IsWearingGasmaskAndHasPistol">
+	<Filter name="GasmaskAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingGasmask</FILTER>
+			<FILTER>Gasmask</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="GasmaskAndPistol">
+		<AND>
+			<FILTER>Gasmask</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingGasmaskAndHasRifle">
+	<Filter name="GasmaskAndRifle">
 		<AND>
-			<FILTER>IsWearingGasmask</FILTER>
+			<FILTER>Gasmask</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="GasmaskAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingGasmask</FILTER>
+			<FILTER>Gasmask</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingNVG">
+	<Filter name="NVG">
 		<OR>
 			<HEAD1POS op="in">211, 246, 1024, 1025</HEAD1POS>
 			<HEAD2POS op="in">211, 246, 1024, 1025</HEAD2POS>
 		</OR>
 	</Filter>
-	<Filter name="IsWearingNVGandHasPistol">
+	<Filter name="NVGAndPistolLeft">
 		<AND>
-			<FILTER>IsWearingGasmask</FILTER>
+			<FILTER>NVG</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
+	<Filter name="NVGAndPistol">
+		<AND>
+			<FILTER>NVG</FILTER>
 			<FILTER>HasPistolOrMPistolInRightHand</FILTER>
 		</AND>
 	</Filter>
-	<Filter name="IsWearingNVGandHasRifle">
+	<Filter name="NVGAndRifle">
 		<AND>
-			<FILTER>IsWearingGasmask</FILTER>
+			<FILTER>NVG</FILTER>
 			<FILTER>HasRifleTypeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="NVGAndBluntMeleeWeapon">
 		<AND>
-			<FILTER>IsWearingGasmask</FILTER>
+			<FILTER>NVG</FILTER>
 			<FILTER>HasBluntMeleeWeaponInHand</FILTER>
 		</AND>
 	</Filter>
@@ -3591,6 +3885,12 @@
 			<HEAD2POS op="in">212</HEAD2POS>
 		</OR>
 	</Filter>
+	<Filter name="GogglesAndPistolLeft">
+		<AND>
+			<FILTER>Goggles</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="GogglesAndPistol">
 		<AND>
 			<FILTER>Goggles</FILTER>
@@ -3615,6 +3915,12 @@
 			<HEAD2POS op="in">210</HEAD2POS>
 		</OR>
 	</Filter>
+	<Filter name="HeadSetAndPistolLeft">
+		<AND>
+			<FILTER>HeadSet</FILTER>
+			<FILTER>HasPistolOrMPistolInLeftHand</FILTER>
+		</AND>
+	</Filter>
 	<Filter name="HeadSetAndPistol">
 		<AND>
 			<FILTER>HeadSet</FILTER>
@@ -3760,25 +4066,25 @@
 	<Filter name="HelmetFox">
 		<AND>
 			<FILTER>IsFox</FILTER>
-			<FILTER>IsWearingHelmet</FILTER>
+			<FILTER>Helmet</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="CamoHelmetFox">
 		<AND>
 			<FILTER>IsFox</FILTER>
-			<FILTER>IsWearingCamoHelmet</FILTER>
+			<FILTER>CamoHelmet</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="GasmaskFox">
 		<AND>
 			<FILTER>IsFox</FILTER>
-			<FILTER>IsWearingGasmask</FILTER>
+			<FILTER>Gasmask</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="NVGFox">
 		<AND>
 			<FILTER>IsFox</FILTER>
-			<FILTER>IsWearingNVG</FILTER>
+			<FILTER>NVG</FILTER>
 		</AND>
 	</Filter>
 	<Filter name="IsElite">
diff --git a/gamedir/Data/TableData/LogicalBodyTypes/LBT_BGM/LogicalBodyType_BGM_gear.xml b/gamedir/Data/TableData/LogicalBodyTypes/LBT_BGM/LogicalBodyType_BGM_gear.xml
index b3cc2a7df..3aa91b64b 100644
--- a/gamedir/Data/TableData/LogicalBodyTypes/LBT_BGM/LogicalBodyType_BGM_gear.xml
+++ b/gamedir/Data/TableData/LogicalBodyTypes/LBT_BGM/LogicalBodyType_BGM_gear.xml
@@ -10,6 +10,7 @@
 			<Surface name="BGMEMPTY_RUN_GHILLIEPANTS" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_GHILLIEPANTS" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_GHILLIEPANTS" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_GHILLIEPANTS" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_GHILLIEPANTS" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_GHILLIEPANTS" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_GHILLIEPANTS" animsurface="BGMWATER_N_AIM" />
@@ -163,6 +164,7 @@
 			<Surface name="BGMEMPTY_RUN_LEGS_C" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_LEGS_C" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_LEGS_C" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_LEGS_C" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_LEGS_C" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_LEGS_C" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_LEGS_C" animsurface="BGMWATER_N_AIM" />
@@ -316,6 +318,7 @@
 			<Surface name="BGMEMPTY_RUN_LEGS_C" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_LEGS_C" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_LEGS_C" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_LEGS_C" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_LEGS_C" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_LEGS_C" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_LEGS_C" animsurface="BGMWATER_N_AIM" />
@@ -469,6 +472,7 @@
 			<Surface name="BGMEMPTY_RUN_LEGS_C" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_LEGS_C" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_LEGS_C" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_LEGS_C" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_LEGS_C" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_LEGS_C" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_LEGS_C" animsurface="BGMWATER_N_AIM" />
@@ -613,11 +617,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_LEGS_C" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_LEGS_C" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="SWATLeggingsAndPistolLeft" palette="swat_blue">
+			<Surface name="BGMEMPTY_RUN_SWATlegs" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_SWATlegs" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="SWATLeggingsAndPistol" palette="swat_blue">
 			<Surface name="BGMPISTOL_WALK_SWATlegs" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_SWATlegs" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_SWATlegs" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_SWATlegs" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_SWATlegs" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_SWATlegs" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_SWATlegs" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_SWATlegs" animsurface="BGMWATER_N_AIM" />
@@ -758,11 +767,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_SWATlegs" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_SWATlegs" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="ZylonPantsAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Zylonlegs" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Zylonlegs" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="ZylonPantsAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Zylonlegs" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Zylonlegs" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Zylonlegs" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Zylonlegs" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Zylonlegs" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Zylonlegs" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Zylonlegs" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Zylonlegs" animsurface="BGMWATER_N_AIM" />
@@ -912,6 +926,7 @@
 			<Surface name="BGMEMPTY_RUN_eod_l" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_eod_l" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_eod_l" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_eod_l" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_eod_l" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_eod_l" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_eod_l" animsurface="BGMWATER_N_AIM" />
@@ -1056,11 +1071,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_eod_l" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_eod_l" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="DressUniformPantsAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Dresslegs" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Dresslegs" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="DressUniformPantsAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Dresslegs" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Dresslegs" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Dresslegs" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Dresslegs" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Dresslegs" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Dresslegs" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Dresslegs" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Dresslegs" animsurface="BGMWATER_N_AIM" />
@@ -1203,11 +1223,16 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="legarmor">
+		<LayerProp filter="KevlarLeggingsAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Kvlrlegs" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Kvlrlegs" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="KevlarLeggingsAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Kvlrlegs" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Kvlrlegs" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Kvlrlegs" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Kvlrlegs" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Kvlrlegs" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Kvlrlegs" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Kvlrlegs" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Kvlrlegs" animsurface="BGMWATER_N_AIM" />
@@ -1348,11 +1373,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Kvlrlegs" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Kvlrlegs" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="SpectraLeggingsAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Speclegs" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Speclegs" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="SpectraLeggingsAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Speclegs" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Speclegs" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Speclegs" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Speclegs" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Speclegs" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Speclegs" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Speclegs" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Speclegs" animsurface="BGMWATER_N_AIM" />
@@ -1493,11 +1523,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Speclegs" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Speclegs" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="TwaronLeggingsAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Twalegs" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Twalegs" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="TwaronLeggingsAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Twalegs" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Twalegs" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Twalegs" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Twalegs" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Twalegs" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Twalegs" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Twalegs" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Twalegs" animsurface="BGMWATER_N_AIM" />
@@ -1638,11 +1673,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Twalegs" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Twalegs" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="DyneemaLeggingsAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Dynlegs" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Dynlegs" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="DyneemaLeggingsAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Dynlegs" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Dynlegs" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Dynlegs" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Dynlegs" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Dynlegs" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Dynlegs" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Dynlegs" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Dynlegs" animsurface="BGMWATER_N_AIM" />
@@ -1794,6 +1834,7 @@
 			<Surface name="BGMEMPTY_RUN_GHILLIEVEST" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_GHILLIEVEST" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_GHILLIEVEST" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_GHILLIEVEST" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_GHILLIEVEST" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_GHILLIEVEST" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_GHILLIEVEST" animsurface="BGMWATER_N_AIM" />
@@ -1947,6 +1988,7 @@
 			<Surface name="BGMEMPTY_RUN_TORSO_C" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_TORSO_C" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_TORSO_C" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_TORSO_C" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_TORSO_C" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_TORSO_C" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_TORSO_C" animsurface="BGMWATER_N_AIM" />
@@ -2100,6 +2142,7 @@
 			<Surface name="BGMEMPTY_RUN_TORSO_C" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_TORSO_C" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_TORSO_C" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_TORSO_C" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_TORSO_C" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_TORSO_C" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_TORSO_C" animsurface="BGMWATER_N_AIM" />
@@ -2253,6 +2296,7 @@
 			<Surface name="BGMEMPTY_RUN_TORSO_C" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_TORSO_C" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_TORSO_C" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_TORSO_C" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_TORSO_C" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_TORSO_C" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_TORSO_C" animsurface="BGMWATER_N_AIM" />
@@ -2397,11 +2441,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_TORSO_C" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_TORSO_C" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="DressUniformVestAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Dressvest" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Dressvest" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="DressUniformVestAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Dressvest" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Dressvest" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Dressvest" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Dressvest" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Dressvest" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Dressvest" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Dressvest" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Dressvest" animsurface="BGMWATER_N_AIM" />
@@ -2548,11 +2597,11 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="hands">
-		<LayerProp filter="LongsleevesANDHasPistolOrMPistolInLeftHand" >
+		<LayerProp filter="LongsleevesAndPistolLeft" >
 			<Surface name="BGMEMPTY_RUN_LSLEEVE" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMDUAL_SDSTP_LSLEEVE" animsurface="BGMSIDESTEP" />
 		</LayerProp>
-		<LayerProp filter="LongsleevesANDHasPistolOrMPistolInRightHand" >
+		<LayerProp filter="LongsleevesAndPistol" >
 			<Surface name="BGMPISTOL_WALK_LSLEEVE" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_LSLEEVE" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_LSLEEVE" animsurface="BGMNOTHING_RUN" />
@@ -2562,7 +2611,7 @@
 			<Surface name="BGM_WATER_PISTOL_WALK_LSLEEVE" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_LSLEEVE" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="LongsleevesANDHasRifleTypeWeaponInHand" >
+		<LayerProp filter="LongsleevesAndRifle" >
 			<Surface name="BGM_RIFLE_OPEN_LSLEEVE" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_LSLEEVE" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_LSLEEVE" animsurface="BGM_COWER_PRONE" />
@@ -2703,16 +2752,21 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="head">
-		<LayerProp filter="IsWearingBalaclavaAndHasPistol">
+		<LayerProp filter="BalaclavaAndPistolLeft" >
+			<Surface name="BGMEMPTY_RUN_balaclava" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_balaclava" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="BalaclavaAndPistol" >
 			<Surface name="BGMPISTOL_WALK_balaclava" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_balaclava" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_balaclava" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_balaclava" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_balaclava" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_balaclava" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_balaclava" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_balaclava" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBalaclavaAndHasRifle">
+		<LayerProp filter="BalaclavaAndRifle">
 			<Surface name="BGM_RIFLE_OPEN_balaclava" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_balaclava" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_balaclava" animsurface="BGM_COWER_PRONE" />
@@ -2853,11 +2907,16 @@
 		</LayerProp> 
 	</Layer>
 	<Layer name="helmet">
+		<LayerProp filter="GhillieHoodAndPistolLeft" palette="WoodlandCamo">
+			<Surface name="BGMEMPTY_RUN_GHILLIEHOOD" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_GHILLIEHOOD" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="GhillieHoodAndPistol" palette="WoodlandCamo">
 			<Surface name="BGMPISTOL_WALK_GHILLIEHOOD" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_GHILLIEHOOD" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_GHILLIEHOOD" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_GHILLIEHOOD" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_GHILLIEHOOD" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_GHILLIEHOOD" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_GHILLIEHOOD" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_GHILLIEHOOD" animsurface="BGMWATER_N_AIM" />
@@ -3016,11 +3075,16 @@
 			<Surface name="BGMEMPTY_ROLL_SIDE_eod_h2" animsurface="BGMROLL_PR" />
 			<Surface name="BGMRIFLE_PRN_COWER_eod_h2" animsurface="BGM_COWER_PRONE" />
 		</LayerProp>
+		<LayerProp filter="EODhelmetAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_eod_h" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_eod_h" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="EODhelmetAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_eod_h" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_eod_h" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_eod_h" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_eod_h" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_eod_h" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_eod_h" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_eod_h" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_eod_h" animsurface="BGMWATER_N_AIM" />
@@ -3165,16 +3229,21 @@
 			<Surface name="BGM_WATER_DUAL_AIM_eod_h" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_eod_h" animsurface="BGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCamoHelmetAndHasPistol" palette="WoodlandCamo">
+		<LayerProp filter="CamoHelmetAndPistolLeft" palette="WoodlandCamo">
+			<Surface name="BGMEMPTY_RUN_CAMOHELMET" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_CAMOHELMET" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="CamoHelmetAndPistol" palette="WoodlandCamo">
 			<Surface name="BGMPISTOL_WALK_CAMOHELMET" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_CAMOHELMET" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_CAMOHELMET" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_CAMOHELMET" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_CAMOHELMET" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_CAMOHELMET" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_CAMOHELMET" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_CAMOHELMET" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCamoHelmetAndHasRifle" palette="WoodlandCamo">
+		<LayerProp filter="CamoHelmetAndRifle" palette="WoodlandCamo">
 			<Surface name="BGM_RIFLE_OPEN_CAMOHELMET" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_CAMOHELMET" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_CAMOHELMET" animsurface="BGM_COWER_PRONE" />
@@ -3194,7 +3263,7 @@
 			<Surface name="BGM_BLUNT_CAMOHELMET" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_CAMOHELMET" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCamoHelmet" palette="WoodlandCamo">
+		<LayerProp filter="CamoHelmet" palette="WoodlandCamo">
 			<Surface name="BGMRIFLE_WALK_CROUCH_CAMOHELMET" animsurface="BGMCROUCH_R_RDY" />
 			<Surface name="BGMRIFLE_WALK_RDY_HERO_CAMOHELMET" animsurface="BGMWALK_R_RDY2" />
 			<Surface name="BGMRIFLE_WALK_CAMOHELMET" animsurface="BGMWALK_R_RDY" />
@@ -3313,11 +3382,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_CAMOHELMET" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_CAMOHELMET" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="SteelHelmetAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Steelhelm" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Steelhelm" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="SteelHelmetAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Steelhelm" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Steelhelm" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Steelhelm" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Steelhelm" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Steelhelm" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Steelhelm" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Steelhelm" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Steelhelm" animsurface="BGMWATER_N_AIM" />
@@ -3461,11 +3535,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Steelhelm" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Steelhelm" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="KevlarHelmetAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Kvlrhelm" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Kvlrhelm" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="KevlarHelmetAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Kvlrhelm" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Kvlrhelm" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Kvlrhelm" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Kvlrhelm" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Kvlrhelm" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Kvlrhelm" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Kvlrhelm" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Kvlrhelm" animsurface="BGMWATER_N_AIM" />
@@ -3609,11 +3688,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Kvlrhelm" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Kvlrhelm" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="SpectraHelmetAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Spechelm" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Spechelm" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="SpectraHelmetAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Spechelm" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Spechelm" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Spechelm" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Spechelm" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Spechelm" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Spechelm" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Spechelm" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Spechelm" animsurface="BGMWATER_N_AIM" />
@@ -3757,11 +3841,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Spechelm" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Spechelm" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="SWATHelmetAndPistolLeft" palette="swat_blue">
+			<Surface name="BGMEMPTY_RUN_SWAThelm" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_SWAThelm" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="SWATHelmetAndPistol" palette="swat_blue">
 			<Surface name="BGMPISTOL_WALK_SWAThelm" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_SWAThelm" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_SWAThelm" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_SWAThelm" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_SWAThelm" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_SWAThelm" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_SWAThelm" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_SWAThelm" animsurface="BGMWATER_N_AIM" />
@@ -3905,11 +3994,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_SWAThelm" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_SWAThelm" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="TwaronHelmetAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Twahelm" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Twahelm" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="TwaronHelmetAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Twahelm" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Twahelm" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Twahelm" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Twahelm" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Twahelm" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Twahelm" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Twahelm" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Twahelm" animsurface="BGMWATER_N_AIM" />
@@ -4053,11 +4147,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Twahelm" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Twahelm" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="DyneemaHelmetAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Dynhelm" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Dynhelm" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="DyneemaHelmetAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Dynhelm" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Dynhelm" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Dynhelm" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Dynhelm" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Dynhelm" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Dynhelm" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Dynhelm" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Dynhelm" animsurface="BGMWATER_N_AIM" />
@@ -4201,16 +4300,21 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Dynhelm" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Dynhelm" animsurface="BGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHelmetAndHasPistol" palette="hats">
+		<LayerProp filter="HelmetAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_HELMET" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_HELMET" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="HelmetAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_HELMET" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_HELMET" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_HELMET" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_HELMET" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_HELMET" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_HELMET" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_HELMET" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_HELMET" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHelmetAndHasRifle" palette="hats">
+		<LayerProp filter="HelmetAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_HELMET" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_HELMET" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_HELMET" animsurface="BGM_COWER_PRONE" />
@@ -4230,7 +4334,7 @@
 			<Surface name="BGM_BLUNT_HELMET" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_HELMET" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHelmet" palette="hats">
+		<LayerProp filter="Helmet" palette="hats">
 			<Surface name="BGMRIFLE_WALK_CROUCH_HELMET" animsurface="BGMCROUCH_R_RDY" />
 			<Surface name="BGMRIFLE_WALK_RDY_HERO_HELMET" animsurface="BGMWALK_R_RDY2" />
 			<Surface name="BGMRIFLE_WALK_HELMET" animsurface="BGMWALK_R_RDY" />
@@ -4349,16 +4453,21 @@
 			<Surface name="BGM_WATER_DUAL_AIM_HELMET" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_HELMET" animsurface="BGMMORTAR" />
 		</LayerProp> 
-		<LayerProp filter="IsWearingRedBeretAndHasPistol" palette="hats">
+		<LayerProp filter="RedBeretAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_BERET" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_BERET" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="RedBeretAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_BERET" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_BERET" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_BERET" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_BERET" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_BERET" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_BERET" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_BERET" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_BERET" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingRedBeretAndHasRifle" palette="hats">
+		<LayerProp filter="RedBeretAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_BERET" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_BERET" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_BERET" animsurface="BGM_COWER_PRONE" />
@@ -4378,7 +4487,7 @@
 			<Surface name="BGM_BLUNT_BERET" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_BERET" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingRedBeret" palette="hats">
+		<LayerProp filter="RedBeret" palette="hats">
 			<Surface name="BGMRIFLE_IDLE_HERO_BERET" animsurface="BGMSTANDING" />
 			<Surface name="BGMRIFLE_IDLE_BERET" animsurface="BGMTHREATENSTAND" />
 			<Surface name="BGMRIFLE_WALK_HERO_BERET" animsurface="BGMWALKING" />
@@ -4497,16 +4606,21 @@
 			<Surface name="BGM_WATER_DUAL_AIM_BERET" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_BERET" animsurface="BGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGreenBeretAndHasPistol" palette="Greenhats">
+		<LayerProp filter="GreenBeretAndPistolLeft" palette="Greenhats">
+			<Surface name="BGMEMPTY_RUN_BERET" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_BERET" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="GreenBeretAndPistol" palette="Greenhats">
 			<Surface name="BGMPISTOL_WALK_BERET" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_BERET" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_BERET" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_BERET" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_BERET" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_BERET" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_BERET" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_BERET" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGreenBeretAndHasRifle" palette="Greenhats">
+		<LayerProp filter="GreenBeretAndRifle" palette="Greenhats">
 			<Surface name="BGM_RIFLE_OPEN_BERET" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_BERET" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_BERET" animsurface="BGM_COWER_PRONE" />
@@ -4526,7 +4640,7 @@
 			<Surface name="BGM_BLUNT_BERET" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_BERET" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGreenBeret" palette="Greenhats">
+		<LayerProp filter="GreenBeret" palette="Greenhats">
 			<Surface name="BGMRIFLE_IDLE_HERO_BERET" animsurface="BGMSTANDING" />
 			<Surface name="BGMRIFLE_IDLE_BERET" animsurface="BGMTHREATENSTAND" />
 			<Surface name="BGMRIFLE_WALK_HERO_BERET" animsurface="BGMWALKING" />
@@ -4645,16 +4759,21 @@
 			<Surface name="BGM_WATER_DUAL_AIM_BERET" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_BERET" animsurface="BGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBlueBeretAndHasPistol" palette="Bluehats">
+		<LayerProp filter="BlueBeretAndPistolLeft" palette="Bluehats">
+			<Surface name="BGMEMPTY_RUN_BERET" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_BERET" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="BlueBeretAndPistol" palette="Bluehats">
 			<Surface name="BGMPISTOL_WALK_BERET" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_BERET" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_BERET" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_BERET" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_BERET" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_BERET" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_BERET" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_BERET" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBlueBeretAndHasRifle" palette="Bluehats">
+		<LayerProp filter="BlueBeretAndRifle" palette="Bluehats">
 			<Surface name="BGM_RIFLE_OPEN_BERET" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_BERET" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_BERET" animsurface="BGM_COWER_PRONE" />
@@ -4674,7 +4793,7 @@
 			<Surface name="BGM_BLUNT_BERET" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_BERET" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBlueBeret" palette="Bluehats">
+		<LayerProp filter="BlueBeret" palette="Bluehats">
 			<Surface name="BGMRIFLE_IDLE_HERO_BERET" animsurface="BGMSTANDING" />
 			<Surface name="BGMRIFLE_IDLE_BERET" animsurface="BGMTHREATENSTAND" />
 			<Surface name="BGMRIFLE_WALK_HERO_BERET" animsurface="BGMWALKING" />
@@ -4793,16 +4912,21 @@
 			<Surface name="BGM_WATER_DUAL_AIM_BERET" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_BERET" animsurface="BGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHatAndHasPistol" palette="WoodlandCamo">
+		<LayerProp filter="BooneyHatAndPistolLeft" palette="WoodlandCamo">
+			<Surface name="BGMEMPTY_RUN_BOONEY" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_BOONEY" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="BooneyHatAndPistol" palette="WoodlandCamo">
 			<Surface name="BGMPISTOL_WALK_BOONEY" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_BOONEY" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_BOONEY" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_BOONEY" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_BOONEY" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_BOONEY" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_BOONEY" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_BOONEY" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHatAndHasRifle" palette="WoodlandCamo">
+		<LayerProp filter="BooneyHatAndRifle" palette="WoodlandCamo">
 			<Surface name="BGM_RIFLE_OPEN_BOONEY" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_BOONEY" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_BOONEY" animsurface="BGM_COWER_PRONE" />
@@ -4818,11 +4942,11 @@
 			<Surface name="BGMRIFLE_SIDESTEP_AIM_HERO_BOONEY" animsurface="BGMSIDESTEP_R_RDY2" />
 			<Surface name="BGMRIFLE_ROLL_SIDE_BOONEY" animsurface="BGMROLL_PR" />
 		</LayerProp>
-		<LayerProp filter="HatAndBluntMeleeWeapon" palette="WoodlandCamo">
+		<LayerProp filter="BooneyHatAndBluntMeleeWeapon" palette="WoodlandCamo">
 			<Surface name="BGM_BLUNT_BOONEY" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_BOONEY" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHat" palette="WoodlandCamo">
+		<LayerProp filter="BooneyHat" palette="WoodlandCamo">
 			<Surface name="BGMRIFLE_IDLE_HERO_BOONEY" animsurface="BGMSTANDING" />
 			<Surface name="BGMRIFLE_IDLE_BOONEY" animsurface="BGMTHREATENSTAND" />
 			<Surface name="BGMRIFLE_WALK_HERO_BOONEY" animsurface="BGMWALKING" />
@@ -4941,11 +5065,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_BOONEY" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_BOONEY" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="FurHatAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Ushanka" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Ushanka" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="FurHatAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Ushanka" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Ushanka" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Ushanka" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Ushanka" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Ushanka" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Ushanka" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Ushanka" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Ushanka" animsurface="BGMWATER_N_AIM" />
@@ -5089,11 +5218,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Ushanka" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Ushanka" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="USOfficerHatAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_UScap" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_UScap" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="USOfficerHatAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_UScap" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_UScap" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_UScap" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_UScap" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_UScap" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_UScap" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_UScap" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_UScap" animsurface="BGMWATER_N_AIM" />
@@ -5237,11 +5371,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_UScap" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_UScap" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="USSROfficerHatAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_USSRcap" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_USSRcap" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="USSROfficerHatAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_USSRcap" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_USSRcap" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_USSRcap" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_USSRcap" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_USSRcap" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_USSRcap" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_USSRcap" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_USSRcap" animsurface="BGMWATER_N_AIM" />
@@ -5385,11 +5524,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_USSRcap" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_USSRcap" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="RussianCapAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_RUScap" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_RUScap" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="RussianCapAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_RUScap" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_RUScap" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_RUScap" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_RUScap" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_RUScap" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_RUScap" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_RUScap" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_RUScap" animsurface="BGMWATER_N_AIM" />
@@ -5533,11 +5677,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_RUScap" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_RUScap" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="BlackCapAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Blackcap" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Blackcap" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="BlackCapAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Blackcap" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Blackcap" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Blackcap" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Blackcap" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Blackcap" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Blackcap" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Blackcap" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Blackcap" animsurface="BGMWATER_N_AIM" />
@@ -5681,11 +5830,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Blackcap" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Blackcap" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="CowboyHatAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Stetson" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Stetson" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="CowboyHatAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Stetson" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Stetson" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Stetson" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Stetson" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Stetson" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Stetson" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Stetson" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Stetson" animsurface="BGMWATER_N_AIM" />
@@ -5829,16 +5983,21 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Stetson" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Stetson" animsurface="BGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBallcapAndHasPistol" >
+		<LayerProp filter="BallcapAndPistolLeft" >
+			<Surface name="BGMEMPTY_RUN_BCAP" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_BCAP" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="BallcapAndPistol" >
 			<Surface name="BGMPISTOL_WALK_BCAP" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_BCAP" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_BCAP" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_BCAP" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_BCAP" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_BCAP" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_BCAP" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_BCAP" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBallcapAndHasRifle" >
+		<LayerProp filter="BallcapAndRifle" >
 			<Surface name="BGM_RIFLE_OPEN_BCAP" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_BCAP" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_BCAP" animsurface="BGM_COWER_PRONE" />
@@ -5858,7 +6017,7 @@
 			<Surface name="BGM_BLUNT_BCAP" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_BCAP" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBallcap" >
+		<LayerProp filter="Ballcap" >
 			<Surface name="BGMRIFLE_IDLE_HERO_BCAP" animsurface="BGMSTANDING" />
 			<Surface name="BGMRIFLE_IDLE_BCAP" animsurface="BGMTHREATENSTAND" />
 			<Surface name="BGMRIFLE_WALK_HERO_BCAP" animsurface="BGMWALKING" />
@@ -5979,16 +6138,21 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="facegear">
-		<LayerProp filter="IsWearingNVGandHasPistol" palette="hats">
+		<LayerProp filter="NVGAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_NVG" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_NVG" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="NVGAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_NVG" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_NVG" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_NVG" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_NVG" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_NVG" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_NVG" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_NVG" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_NVG" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingNVGandHasRifle" palette="hats">
+		<LayerProp filter="NVGAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_NVG" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_NVG" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_NVG" animsurface="BGM_COWER_PRONE" />
@@ -6008,7 +6172,7 @@
 			<Surface name="BGM_BLUNT_NVG" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_NVG" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingNVG" palette="hats">
+		<LayerProp filter="NVG" palette="hats">
 			<Surface name="BGMRIFLE_WALK_CROUCH_NVG" animsurface="BGMCROUCH_R_RDY" />
 			<Surface name="BGMRIFLE_WALK_RDY_HERO_NVG" animsurface="BGMWALK_R_RDY2" />
 			<Surface name="BGMRIFLE_WALK_NVG" animsurface="BGMWALK_R_RDY" />
@@ -6127,11 +6291,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_NVG" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_NVG" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="GogglesAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Goggles" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Goggles" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="GogglesAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Goggles" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Goggles" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Goggles" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Goggles" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Goggles" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Goggles" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Goggles" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Goggles" animsurface="BGMWATER_N_AIM" />
@@ -6277,16 +6446,21 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="gasmask">
-		<LayerProp filter="IsWearingGasmaskAndHasPistol" palette="hats">
+		<LayerProp filter="GasmaskAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_GMASK" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_GMASK" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="GasmaskAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_GMASK" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_GMASK" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_GMASK" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_GMASK" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_GMASK" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_GMASK" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_GMASK" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_GMASK" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGasmaskAndHasRifle" palette="hats">
+		<LayerProp filter="GasmaskAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_GMASK" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_GMASK" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_GMASK" animsurface="BGM_COWER_PRONE" />
@@ -6306,7 +6480,7 @@
 			<Surface name="BGM_BLUNT_GMASK" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_GMASK" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGasmask" palette="hats">
+		<LayerProp filter="Gasmask" palette="hats">
 			<Surface name="BGMRIFLE_WALK_CROUCH_GMASK" animsurface="BGMCROUCH_R_RDY" />
 			<Surface name="BGMRIFLE_WALK_RDY_HERO_GMASK" animsurface="BGMWALK_R_RDY2" />
 			<Surface name="BGMRIFLE_WALK_GMASK" animsurface="BGMWALK_R_RDY" />
@@ -6427,11 +6601,16 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="ears">
+		<LayerProp filter="HeadSetAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Headset" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Headset" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="HeadSetAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Headset" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Headset" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Headset" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Headset" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Headset" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Headset" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Headset" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Headset" animsurface="BGMWATER_N_AIM" />
@@ -6577,11 +6756,16 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="vest">
+		<LayerProp filter="EODvestAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_eod_v" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_eod_v" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="EODvestAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_eod_v" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_eod_v" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_eod_v" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_eod_v" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_eod_v" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_eod_v" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_eod_v" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_eod_v" animsurface="BGMWATER_N_AIM" />
@@ -6726,16 +6910,21 @@
 			<Surface name="BGM_WATER_DUAL_AIM_eod_v" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_eod_v" animsurface="BGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingSpectraVestAndHasPistol" palette="hats">
+		<LayerProp filter="SpectraVestAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_spectra" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_spectra" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="SpectraVestAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_spectra" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_spectra" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_spectra" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_spectra" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_spectra" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_spectra" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_spectra" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_spectra" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingSpectraVestAndHasRifle" palette="hats">
+		<LayerProp filter="SpectraVestAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_spectra" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_spectra" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_spectra" animsurface="BGM_COWER_PRONE" />
@@ -6875,16 +7064,21 @@
 			<Surface name="BGM_WATER_DUAL_AIM_spectra" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_spectra" animsurface="BGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingKevlarVestAndHasPistol" palette="hats">
+		<LayerProp filter="KevlarVestAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_kevlar" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_kevlar" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="KevlarVestAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_kevlar" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_kevlar" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_kevlar" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_kevlar" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_kevlar" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_kevlar" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_kevlar" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_kevlar" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingKevlarVestAndHasRifle" palette="hats">
+		<LayerProp filter="KevlarVestAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_kevlar" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_kevlar" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_kevlar" animsurface="BGM_COWER_PRONE" />
@@ -7024,11 +7218,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_kevlar" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_kevlar" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="FlakVestAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Flakvest" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Flakvest" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="FlakVestAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Flakvest" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Flakvest" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Flakvest" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Flakvest" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Flakvest" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Flakvest" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Flakvest" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Flakvest" animsurface="BGMWATER_N_AIM" />
@@ -7173,11 +7372,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Flakvest" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Flakvest" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="GuardianVestAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Guardvest" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Guardvest" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="GuardianVestAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Guardvest" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Guardvest" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Guardvest" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Guardvest" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Guardvest" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Guardvest" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Guardvest" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Guardvest" animsurface="BGMWATER_N_AIM" />
@@ -7322,11 +7526,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Guardvest" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Guardvest" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="SWATVestAndPistolLeft" palette="swat_blue">
+			<Surface name="BGMEMPTY_RUN_SWATvest" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_SWATvest" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="SWATVestAndPistol" palette="swat_blue">
 			<Surface name="BGMPISTOL_WALK_SWATvest" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_SWATvest" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_SWATvest" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_SWATvest" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_SWATvest" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_SWATvest" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_SWATvest" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_SWATvest" animsurface="BGMWATER_N_AIM" />
@@ -7471,11 +7680,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_SWATvest" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_SWATvest" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="ZylonVestAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Zylonvest" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Zylonvest" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="ZylonVestAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Zylonvest" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Zylonvest" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Zylonvest" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Zylonvest" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Zylonvest" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Zylonvest" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Zylonvest" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Zylonvest" animsurface="BGMWATER_N_AIM" />
@@ -7620,11 +7834,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Zylonvest" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Zylonvest" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="TwaronVestAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Twavest" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Twavest" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="TwaronVestAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Twavest" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Twavest" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Twavest" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Twavest" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Twavest" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Twavest" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Twavest" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Twavest" animsurface="BGMWATER_N_AIM" />
@@ -7769,11 +7988,16 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Twavest" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Twavest" animsurface="BGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="DyneemaVestAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Dynvest" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Dynvest" animsurface="BGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="DyneemaVestAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Dynvest" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Dynvest" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Dynvest" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Dynvest" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Dynvest" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Dynvest" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Dynvest" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Dynvest" animsurface="BGMWATER_N_AIM" />
@@ -7918,16 +8142,21 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Dynvest" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Dynvest" animsurface="BGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingFlakJacketAndHasPistol" palette="hats">
+		<LayerProp filter="ChestRigAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_VEST" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_VEST" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="ChestRigAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_VEST" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_VEST" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_VEST" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_VEST" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_VEST" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_VEST" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_VEST" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_VEST" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingFlakJacketAndHasRifle" palette="hats">
+		<LayerProp filter="ChestRigAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_VEST" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_VEST" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_VEST" animsurface="BGM_COWER_PRONE" />
@@ -7943,11 +8172,11 @@
 			<Surface name="BGMRIFLE_SIDESTEP_AIM_HERO_VEST" animsurface="BGMSIDESTEP_R_RDY2" />
 			<Surface name="BGMRIFLE_ROLL_SIDE_VEST" animsurface="BGMROLL_PR" />
 		</LayerProp>
-		<LayerProp filter="FlakJacketAndBluntMeleeWeapon" palette="hats">
+		<LayerProp filter="ChestRigAndBluntMeleeWeapon" palette="hats">
 			<Surface name="BGM_BLUNT_VEST" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_VEST" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="FlakJacket" palette="hats">
+		<LayerProp filter="ChestRig" palette="hats">
 			<Surface name="BGMRIFLE_WALK_CROUCH_VEST" animsurface="BGMCROUCH_R_RDY" />
 			<Surface name="BGMRIFLE_WALK_RDY_HERO_VEST" animsurface="BGMWALK_R_RDY2" />
 			<Surface name="BGMRIFLE_WALK_VEST" animsurface="BGMWALK_R_RDY" />
@@ -8070,16 +8299,21 @@
 	</Layer>
 	<Layer name="backpack">
 <!--
-		<LayerProp filter="IsWearingBigRadioSetAndHasPistol" palette="hats">
+		<LayerProp filter="BigRadioSetAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Bigradio" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Bigradio" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="BigRadioSetAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Bigradio" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Bigradio" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Bigradio" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Bigradio" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Bigradio" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Bigradio" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Bigradio" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Bigradio" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBigRadioSetAndHasRifle" palette="hats">
+		<LayerProp filter="BigRadioSetAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_Bigradio" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_Bigradio" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_Bigradio" animsurface="BGM_COWER_PRONE" />
@@ -8099,7 +8333,7 @@
 			<Surface name="BGM_BLUNT_Bigradio" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_Bigradio" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBigRadioSet" palette="hats">
+		<LayerProp filter="BigRadioSet" palette="hats">
 			<Surface name="BGMRIFLE_WALK_CROUCH_Bigradio" animsurface="BGMCROUCH_R_RDY" />
 			<Surface name="BGM_CROUCHWALK_Bigradio" animsurface="BGMCROUCH_P_RDY" />
 			<Surface name="BGM_CROUCHWALK_DUAL_Bigradio" animsurface="BGMCROUCH_D_RDY" />
@@ -8217,16 +8451,21 @@
 			<Surface name="BGM_CROUCH_MORTAR_Bigradio" animsurface="BGMMORTAR" />
 		</LayerProp>
 -->
-		<LayerProp filter="IsWearingMedRadioSetAndHasPistol" palette="hats">
+		<LayerProp filter="MedRadioSetAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_Medradio" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_Medradio" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="MedRadioSetAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_Medradio" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_Medradio" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_Medradio" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_Medradio" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_Medradio" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_Medradio" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_Medradio" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_Medradio" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingMedRadioSetAndHasRifle" palette="hats">
+		<LayerProp filter="MedRadioSetAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_Medradio" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_Medradio" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_Medradio" animsurface="BGM_COWER_PRONE" />
@@ -8246,7 +8485,7 @@
 			<Surface name="BGM_BLUNT_Medradio" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_Medradio" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingMedRadioSet" palette="hats">
+		<LayerProp filter="MedRadioSet" palette="hats">
 			<Surface name="BGMRIFLE_WALK_CROUCH_Medradio" animsurface="BGMCROUCH_R_RDY" />
 			<Surface name="BGM_CROUCHWALK_Medradio" animsurface="BGMCROUCH_P_RDY" />
 			<Surface name="BGM_CROUCHWALK_DUAL_Medradio" animsurface="BGMCROUCH_D_RDY" />
@@ -8363,16 +8602,21 @@
 			<Surface name="BGM_WATER_DUAL_AIM_Medradio" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_Medradio" animsurface="BGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCombatPackAndHasPistol" palette="hats">
+		<LayerProp filter="CombatPackAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_CP" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_CP" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="CombatPackAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_CP" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_CP" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_CP" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_CP" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_CP" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_CP" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_CP" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_CP" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCombatPackAndHasRifle" palette="hats">
+		<LayerProp filter="CombatPackAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_CP" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_CP" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_CP" animsurface="BGM_COWER_PRONE" />
@@ -8392,7 +8636,7 @@
 			<Surface name="BGM_BLUNT_CP" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_CP" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCombatPack" palette="hats">
+		<LayerProp filter="CombatPack" palette="hats">
 			<Surface name="BGMRIFLE_WALK_CROUCH_CP" animsurface="BGMCROUCH_R_RDY" />
 			<Surface name="BGM_CROUCHWALK_CP" animsurface="BGMCROUCH_P_RDY" />
 			<Surface name="BGM_CROUCHWALK_DUAL_CP" animsurface="BGMCROUCH_D_RDY" />
@@ -8509,16 +8753,21 @@
 			<Surface name="BGM_WATER_DUAL_AIM_CP" animsurface="BGMWATER_DBLSHT" />
 			<Surface name="BGM_CROUCH_MORTAR_CP" animsurface="BGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBackpackAndHasPistol" palette="hats">
+		<LayerProp filter="BackpackAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_BP" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_BP" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="BackpackAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_BP" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_BP" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_BP" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_BP" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_BP" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_BP" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_BP" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_BP" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBackpackAndHasRifle" palette="hats">
+		<LayerProp filter="BackpackAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_BP" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_BP" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_BP" animsurface="BGM_COWER_PRONE" />
@@ -8538,7 +8787,7 @@
 			<Surface name="BGM_BLUNT_BP" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_BP" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBackpack" palette="hats">
+		<LayerProp filter="Backpack" palette="hats">
 			<Surface name="BGMRIFLE_WALK_CROUCH_BP" animsurface="BGMCROUCH_R_RDY" />
 			<Surface name="BGM_CROUCHWALK_BP" animsurface="BGMCROUCH_P_RDY" />
 			<Surface name="BGM_CROUCHWALK_DUAL_BP" animsurface="BGMCROUCH_D_RDY" />
@@ -8657,16 +8906,21 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="legrig">
-		<LayerProp filter="HasHolsterAndPistol" palette="hats">
+		<LayerProp filter="HolsterAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_holster" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_holster" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="HolsterAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_holster" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_holster" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_holster" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_holster" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_holster" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_holster" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_holster" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_holster" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="HasHolsterAndRifle" palette="hats">
+		<LayerProp filter="HolsterAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_holster" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_holster" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_holster" animsurface="BGM_COWER_PRONE" />
@@ -8804,16 +9058,21 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="legrig_left">
-		<LayerProp filter="HasLeftHolsterAndPistol" palette="hats">
+		<LayerProp filter="LeftHolsterAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_holster_l" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_holster_l" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="LeftHolsterAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_holster_l" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_holster_l" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_holster_l" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_holster_l" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_holster_l" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_holster_l" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_holster_l" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_holster_l" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="HasLeftHolsterAndRifle" palette="hats">
+		<LayerProp filter="LeftHolsterAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_holster_l" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_holster_l" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_holster_l" animsurface="BGM_COWER_PRONE" />
@@ -8833,7 +9092,7 @@
 			<Surface name="BGM_BLUNT_holster_l" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_holster_l" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="HolsterLeft" palette="hats">
+		<LayerProp filter="LeftHolster" palette="hats">
 			<Surface name="BGMRIFLE_WALK_CROUCH_holster_l" animsurface="BGMCROUCH_R_RDY" />
 			<Surface name="BGM_CROUCHWALK_holster_l" animsurface="BGMCROUCH_P_RDY" />
 			<Surface name="BGM_CROUCHWALK_DUAL_holster_l" animsurface="BGMCROUCH_D_RDY" />
@@ -8951,16 +9210,21 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="knees">
-		<LayerProp filter="HasKneepadsAndHasPistol" palette="hats">
+		<LayerProp filter="KneepadsAndPistolLeft" palette="hats">
+			<Surface name="BGMEMPTY_RUN_PADS" animsurface="BGMPISTOL_RUN" />			
+			<Surface name="BGMDUAL_SDSTP_PADS" animsurface="BGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="KneepadsAndPistol" palette="hats">
 			<Surface name="BGMPISTOL_WALK_PADS" animsurface="BGMNOTHING_WALK" />
 			<Surface name="BGMEMPTY_RUN_PADS" animsurface="BGMPISTOL_RUN" />			
 			<Surface name="BGMEMPTY_RUN_PADS" animsurface="BGMNOTHING_RUN" />
 			<Surface name="BGMPISTOL_SDSTP_PADS" animsurface="BGMSIDESTEP" />
+			<Surface name="BGMEMPTY_DRUNK_PADS" animsurface="BGMPISTOLDRUNK" />
 			<Surface name="BGM_WATER_PISTOL_IDLE_PADS" animsurface="BGMWATER_N_STD" />
 			<Surface name="BGM_WATER_PISTOL_WALK_PADS" animsurface="BGMWATER_N_WALK" />
 			<Surface name="BGM_WATER_PISTOL_AIM_PADS" animsurface="BGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="HasKneepadsAndHasRifle" palette="hats">
+		<LayerProp filter="KneepadsAndRifle" palette="hats">
 			<Surface name="BGM_RIFLE_OPEN_PADS" animsurface="BGMOPEN" />
 			<Surface name="BGMRIFLE_COWER_PADS" animsurface="BGMCOWER" />
 			<Surface name="BGMRIFLE_PRN_COWER_PADS" animsurface="BGM_COWER_PRONE" />
@@ -8980,7 +9244,7 @@
 			<Surface name="BGM_BLUNT_PADS" animsurface="BGMPUNCH" />
 			<Surface name="BGMCROWBAR_CR_HIT_PADS" animsurface="BGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="HasKneepads" palette="hats">
+		<LayerProp filter="Kneepads" palette="hats">
 			<Surface name="BGMRIFLE_WALK_CROUCH_PADS" animsurface="BGMCROUCH_R_RDY" />
 			<Surface name="BGM_CROUCHWALK_PADS" animsurface="BGMCROUCH_P_RDY" />
 			<Surface name="BGM_CROUCHWALK_DUAL_PADS" animsurface="BGMCROUCH_D_RDY" />
diff --git a/gamedir/Data/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_RGF_gear.xml b/gamedir/Data/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_RGF_gear.xml
index e7aeeed00..724b62315 100644
--- a/gamedir/Data/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_RGF_gear.xml
+++ b/gamedir/Data/TableData/LogicalBodyTypes/LBT_RGF/LogicalBodyType_RGF_gear.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LogicalAnimationSurfaces>
 	<Layer name="legs">
+		<LayerProp filter="GhilliePantsAndPistolLeft" palette="WoodlandCamo">
+			<Surface name="RGF_EMPTY_RUN_GHILLIEPANTS" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_GHILLIEPANTS" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="GhilliePantsAndPistol" palette="WoodlandCamo">
 			<Surface name="RGF_EMPTY_RUN_GHILLIEPANTS" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_GHILLIEPANTS" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_GHILLIEPANTS" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_GHILLIEPANTS" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_GHILLIEPANTS" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_GHILLIEPANTS" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_GHILLIEPANTS" animsurface="RGFWATER_N_AIM" />
@@ -133,10 +138,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_GHILLIEPANTS" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_GHILLIEPANTS" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="CamoPantsAndPistolLeft" palette="WoodlandCamo">
+			<Surface name="RGF_EMPTY_RUN_LEGS_C" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_LEGS_C" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="CamoPantsAndPistol" palette="WoodlandCamo">
 			<Surface name="RGF_EMPTY_RUN_LEGS_C" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_LEGS_C" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_LEGS_C" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_LEGS_C" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_LEGS_C" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_LEGS_C" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_LEGS_C" animsurface="RGFWATER_N_AIM" />
@@ -265,10 +275,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_LEGS_C" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_LEGS_C" animsurface="RGFSLAP" />
 		</LayerProp>
+		<LayerProp filter="DesertCamoPantsAndPistolLeft" palette="DesertlandCamo">
+			<Surface name="RGF_EMPTY_RUN_LEGS_C" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_LEGS_C" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="DesertCamoPantsAndPistol" palette="DesertlandCamo">
 			<Surface name="RGF_EMPTY_RUN_LEGS_C" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_LEGS_C" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_LEGS_C" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_LEGS_C" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_LEGS_C" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_LEGS_C" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_LEGS_C" animsurface="RGFWATER_N_AIM" />
@@ -397,10 +412,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_LEGS_C" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_LEGS_C" animsurface="RGFSLAP" />
 		</LayerProp>
-		<LayerProp filter="UrbanCamoPantsAndPistol" palette="UrbanlandCamo">
+		<LayerProp filter="DesertCamoPantsAndPistolLeft" palette="DesertlandCamo">
+			<Surface name="RGF_EMPTY_RUN_LEGS_C" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_LEGS_C" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="DesertCamoPantsAndPistol" palette="DesertlandCamo">
 			<Surface name="RGF_EMPTY_RUN_LEGS_C" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_LEGS_C" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_LEGS_C" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_LEGS_C" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_LEGS_C" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_LEGS_C" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_LEGS_C" animsurface="RGFWATER_N_AIM" />
@@ -529,11 +549,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_LEGS_C" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_LEGS_C" animsurface="RGFSLAP" />
 		</LayerProp>
+		<LayerProp filter="SWATLeggingsAndPistolLeft" palette="swat_blue">
+			<Surface name="RGF_EMPTY_RUN_SWATlegs" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_SWATlegs" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="SWATLeggingsAndPistol" palette="swat_blue">
-			<Surface name="RGF_EMPTY_WALK_SWATlegs" animsurface="RGFNOTHING_WALK"/>
 			<Surface name="RGF_EMPTY_RUN_SWATlegs" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_SWATlegs" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_SWATlegs" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_SWATlegs" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_SWATlegs" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_SWATlegs" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_SWATlegs" animsurface="RGFWATER_N_AIM" />
@@ -666,11 +690,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_SWATlegs" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_SWATlegs" animsurface="RGFSLAP" />
 		</LayerProp>
+		<LayerProp filter="ZylonPantsAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Zylonlegs" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Zylonlegs" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="ZylonPantsAndPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_Zylonlegs" animsurface="RGFNOTHING_WALK"/>
 			<Surface name="RGF_EMPTY_RUN_Zylonlegs" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Zylonlegs" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Zylonlegs" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Zylonlegs" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Zylonlegs" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Zylonlegs" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Zylonlegs" animsurface="RGFWATER_N_AIM" />
@@ -803,10 +831,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Zylonlegs" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Zylonlegs" animsurface="RGFSLAP" />
 		</LayerProp>
+		<LayerProp filter="EODpantsAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_eod_l" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_eod_l" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="EODpantsAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_eod_l" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_eod_l" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_eod_l" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_eod_l" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_eod_l" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_eod_l" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_eod_l" animsurface="RGFWATER_N_AIM" />
@@ -942,11 +975,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_eod_l" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_eod_l" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="DressUniformPantsAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Dresslegs" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Dresslegs" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="DressUniformPantsAndPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_Dresslegs" animsurface="RGFNOTHING_WALK"/>
 			<Surface name="RGF_EMPTY_RUN_Dresslegs" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Dresslegs" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Dresslegs" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Dresslegs" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Dresslegs" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Dresslegs" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Dresslegs" animsurface="RGFWATER_N_AIM" />
@@ -1081,11 +1118,15 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="legarmor">
+		<LayerProp filter="KevlarLeggingsAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Kvlrlegs" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Kvlrlegs" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="KevlarLeggingsAndPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_Kvlrlegs" animsurface="RGFNOTHING_WALK"/>
 			<Surface name="RGF_EMPTY_RUN_Kvlrlegs" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Kvlrlegs" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Kvlrlegs" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Kvlrlegs" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Kvlrlegs" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Kvlrlegs" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Kvlrlegs" animsurface="RGFWATER_N_AIM" />
@@ -1218,11 +1259,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Kvlrlegs" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Kvlrlegs" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="SpectraLeggingsAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Speclegs" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Speclegs" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="SpectraLeggingsAndPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_Speclegs" animsurface="RGFNOTHING_WALK"/>
 			<Surface name="RGF_EMPTY_RUN_Speclegs" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Speclegs" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Speclegs" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Speclegs" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Speclegs" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Speclegs" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Speclegs" animsurface="RGFWATER_N_AIM" />
@@ -1355,11 +1400,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Speclegs" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Speclegs" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="TwaronLeggingsAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Twalegs" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Twalegs" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="TwaronLeggingsAndPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_Twalegs" animsurface="RGFNOTHING_WALK"/>
 			<Surface name="RGF_EMPTY_RUN_Twalegs" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Twalegs" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Twalegs" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Twalegs" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Twalegs" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Twalegs" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Twalegs" animsurface="RGFWATER_N_AIM" />
@@ -1492,11 +1541,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Twalegs" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Twalegs" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="DyneemaLeggingsAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Dynlegs" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Dynlegs" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="DyneemaLeggingsAndPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_Dynlegs" animsurface="RGFNOTHING_WALK"/>
 			<Surface name="RGF_EMPTY_RUN_Dynlegs" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Dynlegs" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Dynlegs" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Dynlegs" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Dynlegs" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Dynlegs" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Dynlegs" animsurface="RGFWATER_N_AIM" />
@@ -2179,13 +2232,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_TORSO_C" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_TORSO_C" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="DressUniformVestAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Dressvest" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Dressvest" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="DressUniformVestAndPistol" palette="hats">
-			<Surface name="RGF_PISTOL_IDLE_Dressvest" animsurface="RGFPISTOLBREATH"/>
-			<Surface name="RGF_EMPTY_WALK_Dressvest" animsurface="RGFNOTHING_WALK"/>
-			<Surface name="RGF_PISTOL_RDY_WALK_Dressvest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_EMPTY_RUN_Dressvest" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Dressvest" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Dressvest" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Dressvest" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Dressvest" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Dressvest" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Dressvest" animsurface="RGFWATER_N_AIM" />
@@ -2244,6 +2299,8 @@
 			<Surface name="RGF_EMPTY_PRONE_Dressvest" animsurface="RGFHANDGUN_PRONE"/>
 			<Surface name="RGF_DUAL_PRONE_Dressvest" animsurface="RGFDWPRONE"/>
 			<Surface name="RGF_DUAL_RDY_WALK_Dressvest" animsurface="RGFWALK_D_RDY"/>
+			<Surface name="RGF_PISTOL_IDLE_Dressvest" animsurface="RGFPISTOLBREATH"/>
+			<Surface name="RGF_PISTOL_RDY_WALK_Dressvest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_PISTOL_AIM_Dressvest" animsurface="RGFHANDGUN_S_SHOT"/>
 			<Surface name="RGF_PISTOL_AIM_1H_Dressvest" animsurface="RGF_PFSHOT_AIM"/>
 			<Surface name="RGF_PISTOL_LOW_Dressvest" animsurface="RGFPISTOLSHOOTLOW"/>
@@ -2322,11 +2379,11 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="hands">
-		<LayerProp filter="LongsleevesANDHasPistolOrMPistolInLeftHand">
+		<LayerProp filter="LongsleevesAndPistolLeft">
 			<Surface name="RGF_EMPTY_RUN_LSLEEVE" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_DUAL_SDSTP_LSLEEVE" animsurface="RGFSIDESTEP"/>
 		</LayerProp>
-		<LayerProp filter="LongsleevesANDHasPistolOrMPistolInRightHand">
+		<LayerProp filter="LongsleevesAndPistol">
 			<Surface name="RGF_EMPTY_RUN_LSLEEVE" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_LSLEEVE" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_LSLEEVE" animsurface="RGFSIDESTEP"/>
@@ -2335,7 +2392,7 @@
 			<Surface name="RGF_WATER_EMPTY_WALK_LSLEEVE" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_LSLEEVE" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="LongsleevesANDHasRifleTypeWeaponInHand">
+		<LayerProp filter="LongsleevesAndRifle">
 			<Surface name="RGF_RIFLE_OPEN_LSLEEVE" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_LSLEEVE" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_LSLEEVE" animsurface="RGF_COWER_PRONE"/>
@@ -2468,15 +2525,20 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="head">
-		<LayerProp filter="IsWearingBalaclavaAndHasPistol">
+		<LayerProp filter="BalaclavaAndPistolLeft" >
+			<Surface name="RGF_EMPTY_RUN_balaclava" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_balaclava" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="BalaclavaAndPistol" >
 			<Surface name="RGF_EMPTY_RUN_balaclava" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_balaclava" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_balaclava" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_balaclava" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_balaclava" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_balaclava" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_balaclava" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBalaclavaAndHasRifle">
+		<LayerProp filter="BalaclavaAndRifle">
 			<Surface name="RGF_RIFLE_OPEN_balaclava" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_balaclava" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_balaclava" animsurface="RGF_COWER_PRONE"/>
@@ -2609,10 +2671,15 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="helmet">
+		<LayerProp filter="GhillieHoodAndPistolLeft" palette="WoodlandCamo">
+			<Surface name="RGF_EMPTY_RUN_GHILLIEHOOD" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_GHILLIEHOOD" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="GhillieHoodAndPistol" palette="WoodlandCamo">
 			<Surface name="RGF_EMPTY_RUN_GHILLIEHOOD" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_GHILLIEHOOD" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_GHILLIEHOOD" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_GHILLIEHOOD" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_GHILLIEHOOD" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_GHILLIEHOOD" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_GHILLIEHOOD" animsurface="RGFWATER_N_AIM" />
@@ -2756,10 +2823,15 @@
 			<Surface name="RGF_EMPTY_ROLL_SIDE_eod_h2" animsurface="RGFROLL_PR" />
 			<Surface name="RGF_RIFLE_PRN_COWER_eod_h2" animsurface="RGF_COWER_PRONE" />
 		</LayerProp>
+		<LayerProp filter="EODhelmetAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_eod_h" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_eod_h" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="EODhelmetAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_eod_h" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_eod_h" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_eod_h" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_eod_h" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_eod_h" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_eod_h" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_eod_h" animsurface="RGFWATER_N_AIM" />
@@ -2895,15 +2967,20 @@
 			<Surface name="RGF_CROUCH_MORTAR_eod_h" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_eod_h" animsurface="RGFSLAP" />			
 		</LayerProp>
-		<LayerProp filter="IsWearingCamoHelmetAndHasPistol" palette="WoodlandCamo">
+		<LayerProp filter="CamoHelmetAndPistolLeft" palette="WoodlandCamo">
+			<Surface name="RGF_EMPTY_RUN_CAMOHELMET" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_CAMOHELMET" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="CamoHelmetAndPistol" palette="WoodlandCamo">
 			<Surface name="RGF_EMPTY_RUN_CAMOHELMET" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_CAMOHELMET" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_CAMOHELMET" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_CAMOHELMET" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_CAMOHELMET" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_CAMOHELMET" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_CAMOHELMET" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCamoHelmetAndHasRifle" palette="WoodlandCamo">
+		<LayerProp filter="CamoHelmetAndRifle" palette="WoodlandCamo">
 			<Surface name="RGF_RIFLE_OPEN_CAMOHELMET" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_CAMOHELMET" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_CAMOHELMET" animsurface="RGF_COWER_PRONE"/>
@@ -2920,7 +2997,7 @@
 			<Surface name="RGF_BLUNT_CAMOHELMET" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_CAMOHELMET" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCamoHelmet" palette="WoodlandCamo">
+		<LayerProp filter="CamoHelmet" palette="WoodlandCamo">
 			<Surface name="RGF_RIFLE_WALK_CROUCH_CAMOHELMET" animsurface="RGFCROUCH_R_RDY"/>
 			<Surface name="RGF_RIFLE_WALK_CAMOHELMET" animsurface="RGFWALK_R_RDY"/>
 			<Surface name="RGF_RIFLE_IDLE_CAMOHELMET" animsurface="RGFSTANDING"/>
@@ -3034,10 +3111,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_CAMOHELMET" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_CAMOHELMET" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="SteelHelmetAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Steelhelm" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Steelhelm" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="SteelHelmetAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_Steelhelm" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Steelhelm" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Steelhelm" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Steelhelm" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Steelhelm" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Steelhelm" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Steelhelm" animsurface="RGFWATER_N_AIM" />
@@ -3173,10 +3255,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Steelhelm" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Steelhelm" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="KevlarHelmetAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Kvlrhelm" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Kvlrhelm" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="KevlarHelmetAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_Kvlrhelm" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Kvlrhelm" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Kvlrhelm" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Kvlrhelm" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Kvlrhelm" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Kvlrhelm" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Kvlrhelm" animsurface="RGFWATER_N_AIM" />
@@ -3312,10 +3399,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Kvlrhelm" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Kvlrhelm" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="SpectraHelmetAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Spechelm" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Spechelm" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="SpectraHelmetAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_Spechelm" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Spechelm" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Spechelm" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Spechelm" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Spechelm" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Spechelm" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Spechelm" animsurface="RGFWATER_N_AIM" />
@@ -3451,10 +3543,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Spechelm" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Spechelm" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="SWATHelmetAndPistolLeft" palette="swat_blue">
+			<Surface name="RGF_EMPTY_RUN_SWAThelm" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_SWAThelm" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="SWATHelmetAndPistol" palette="swat_blue">
 			<Surface name="RGF_EMPTY_RUN_SWAThelm" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_SWAThelm" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_SWAThelm" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_SWAThelm" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_SWAThelm" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_SWAThelm" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_SWAThelm" animsurface="RGFWATER_N_AIM" />
@@ -3590,10 +3687,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_SWAThelm" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_SWAThelm" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="TwaronHelmetAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Twahelm" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Twahelm" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="TwaronHelmetAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_Twahelm" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Twahelm" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Twahelm" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Twahelm" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Twahelm" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Twahelm" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Twahelm" animsurface="RGFWATER_N_AIM" />
@@ -3729,10 +3831,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Twahelm" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Twahelm" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="DyneemaHelmetAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Dynhelm" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Dynhelm" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="DyneemaHelmetAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_Dynhelm" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Dynhelm" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Dynhelm" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Dynhelm" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Dynhelm" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Dynhelm" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Dynhelm" animsurface="RGFWATER_N_AIM" />
@@ -3868,15 +3975,20 @@
 			<Surface name="RGF_CROUCH_MORTAR_Dynhelm" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Dynhelm" animsurface="RGFSLAP" />			
 		</LayerProp>
-		<LayerProp filter="IsWearingHelmetAndHasPistol" palette="hats">
+		<LayerProp filter="HelmetAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_HELMET" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_HELMET" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="HelmetAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_HELMET" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_HELMET" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_HELMET" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_HELMET" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_HELMET" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_HELMET" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_HELMET" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHelmetAndHasRifle" palette="hats">
+		<LayerProp filter="HelmetAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_HELMET" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_HELMET" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_HELMET" animsurface="RGF_COWER_PRONE"/>
@@ -3893,7 +4005,7 @@
 			<Surface name="RGF_BLUNT_HELMET" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_HELMET" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHelmet" palette="hats">
+		<LayerProp filter="Helmet" palette="hats">
 			<Surface name="RGF_RIFLE_WALK_CROUCH_HELMET" animsurface="RGFCROUCH_R_RDY"/>
 			<Surface name="RGF_RIFLE_WALK_HELMET" animsurface="RGFWALK_R_RDY"/>
 			<Surface name="RGF_RIFLE_IDLE_HELMET" animsurface="RGFSTANDING"/>
@@ -4007,15 +4119,20 @@
 			<Surface name="RGF_CROUCH_MORTAR_HELMET" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_HELMET" animsurface="RGFSLAP" />			
 		</LayerProp>
-		<LayerProp filter="IsWearingRedBeretAndHasPistol" palette="hats">
+		<LayerProp filter="RedBeretAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_BERET" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_BERET" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="RedBeretAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_BERET" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_BERET" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_BERET" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_BERET" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_BERET" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_BERET" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_BERET" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingRedBeretAndHasRifle" palette="hats">
+		<LayerProp filter="RedBeretAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_BERET" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_BERET" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_BERET" animsurface="RGF_COWER_PRONE"/>
@@ -4032,7 +4149,7 @@
 			<Surface name="RGF_BLUNT_BERET" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_BERET" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingRedBeret" palette="hats">
+		<LayerProp filter="RedBeret" palette="hats">
 			<Surface name="RGF_RIFLE_IDLE_BERET" animsurface="RGFSTANDING"/>
 			<Surface name="RGF_BASICWALK_BERET" animsurface="RGFWALKING"/>
 			<Surface name="RGF_RUNNING_BERET" animsurface="RGFRUNNING"/>
@@ -4146,15 +4263,20 @@
 			<Surface name="RGF_CROUCH_MORTAR_BERET" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_BERET" animsurface="RGFSLAP" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGreenBeretAndHasPistol" palette="Greenhats">
+		<LayerProp filter="GreenBeretAndPistolLeft" palette="Greenhats">
+			<Surface name="RGF_EMPTY_RUN_BERET" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_BERET" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="GreenBeretAndPistol" palette="Greenhats">
 			<Surface name="RGF_EMPTY_RUN_BERET" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_BERET" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_BERET" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_BERET" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_BERET" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_BERET" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_BERET" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGreenBeretAndHasRifle" palette="Greenhats">
+		<LayerProp filter="GreenBeretAndRifle" palette="Greenhats">
 			<Surface name="RGF_RIFLE_OPEN_BERET" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_BERET" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_BERET" animsurface="RGF_COWER_PRONE"/>
@@ -4171,7 +4293,7 @@
 			<Surface name="RGF_BLUNT_BERET" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_BERET" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGreenBeret" palette="Greenhats">
+		<LayerProp filter="GreenBeret" palette="Greenhats">
 			<Surface name="RGF_RIFLE_IDLE_BERET" animsurface="RGFSTANDING"/>
 			<Surface name="RGF_BASICWALK_BERET" animsurface="RGFWALKING"/>
 			<Surface name="RGF_RUNNING_BERET" animsurface="RGFRUNNING"/>
@@ -4285,15 +4407,20 @@
 			<Surface name="RGF_CROUCH_MORTAR_BERET" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_BERET" animsurface="RGFSLAP" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBlueBeretAndHasPistol" palette="Bluehats">
+		<LayerProp filter="BlueBeretAndPistolLeft" palette="Bluehats">
+			<Surface name="RGF_EMPTY_RUN_BERET" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_BERET" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="BlueBeretAndPistol" palette="Bluehats">
 			<Surface name="RGF_EMPTY_RUN_BERET" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_BERET" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_BERET" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_BERET" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_BERET" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_BERET" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_BERET" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBlueBeretAndHasRifle" palette="Bluehats">
+		<LayerProp filter="BlueBeretAndRifle" palette="Bluehats">
 			<Surface name="RGF_RIFLE_OPEN_BERET" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_BERET" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_BERET" animsurface="RGF_COWER_PRONE"/>
@@ -4310,7 +4437,7 @@
 			<Surface name="RGF_BLUNT_BERET" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_BERET" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBlueBeret" palette="Bluehats">
+		<LayerProp filter="BlueBeret" palette="Bluehats">
 			<Surface name="RGF_RIFLE_IDLE_BERET" animsurface="RGFSTANDING"/>
 			<Surface name="RGF_BASICWALK_BERET" animsurface="RGFWALKING"/>
 			<Surface name="RGF_RUNNING_BERET" animsurface="RGFRUNNING"/>
@@ -4424,15 +4551,20 @@
 			<Surface name="RGF_CROUCH_MORTAR_BERET" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_BERET" animsurface="RGFSLAP" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHatAndHasPistol" palette="WoodlandCamo">
+		<LayerProp filter="BooneyHatAndPistolLeft" palette="WoodlandCamo">
+			<Surface name="RGF_EMPTY_RUN_BOONEY" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_BOONEY" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="BooneyHatAndPistol" palette="WoodlandCamo">
 			<Surface name="RGF_EMPTY_RUN_BOONEY" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_BOONEY" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_BOONEY" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_BOONEY" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_BOONEY" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_BOONEY" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_BOONEY" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHatAndHasRifle" palette="WoodlandCamo">
+		<LayerProp filter="BooneyHatAndRifle" palette="WoodlandCamo">
 			<Surface name="RGF_RIFLE_OPEN_BOONEY" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_BOONEY" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_BOONEY" animsurface="RGF_COWER_PRONE"/>
@@ -4445,11 +4577,11 @@
 			<Surface name="RGF_RIFLE_SIDESTEP_AIM_BOONEY" animsurface="RGFSIDESTEP_R_RDY"/>
 			<Surface name="RGF_RIFLE_ROLL_SIDE_BOONEY" animsurface="RGFROLL_PR"/>
 		</LayerProp>
-		<LayerProp filter="HatAndBluntMeleeWeapon" palette="WoodlandCamo">
+		<LayerProp filter="BooneyHatAndBluntMeleeWeapon" palette="WoodlandCamo">
 			<Surface name="RGF_BLUNT_BOONEY" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_BOONEY" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHat" palette="WoodlandCamo">
+		<LayerProp filter="BooneyHat" palette="WoodlandCamo">
 			<Surface name="RGF_RIFLE_IDLE_BOONEY" animsurface="RGFSTANDING"/>
 			<Surface name="RGF_BASICWALK_BOONEY" animsurface="RGFWALKING"/>
 			<Surface name="RGF_RUNNING_BOONEY" animsurface="RGFRUNNING"/>
@@ -4563,10 +4695,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_BOONEY" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_BOONEY" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="FurHatAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Ushanka" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Ushanka" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="FurHatAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_Ushanka" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Ushanka" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Ushanka" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Ushanka" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Ushanka" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Ushanka" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Ushanka" animsurface="RGFWATER_N_AIM" />
@@ -4702,10 +4839,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Ushanka" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Ushanka" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="USOfficerHatAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_UScap" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_UScap" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="USOfficerHatAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_UScap" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_UScap" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_UScap" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_UScap" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_UScap" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_UScap" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_UScap" animsurface="RGFWATER_N_AIM" />
@@ -4841,10 +4983,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_UScap" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_UScap" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="USSROfficerHatAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_USSRcap" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_USSRcap" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="USSROfficerHatAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_USSRcap" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_USSRcap" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_USSRcap" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_USSRcap" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_USSRcap" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_USSRcap" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_USSRcap" animsurface="RGFWATER_N_AIM" />
@@ -4980,10 +5127,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_USSRcap" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_USSRcap" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="RussianCapAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_RUScap" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_RUScap" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="RussianCapAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_RUScap" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_RUScap" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_RUScap" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_RUScap" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_RUScap" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_RUScap" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_RUScap" animsurface="RGFWATER_N_AIM" />
@@ -5119,10 +5271,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_RUScap" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_RUScap" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="BlackCapAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Blackcap" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Blackcap" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="BlackCapAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_Blackcap" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Blackcap" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Blackcap" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Blackcap" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Blackcap" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Blackcap" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Blackcap" animsurface="RGFWATER_N_AIM" />
@@ -5258,10 +5415,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Blackcap" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Blackcap" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="CowboyHatAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Stetson" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Stetson" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="CowboyHatAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_Stetson" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Stetson" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Stetson" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Stetson" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Stetson" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Stetson" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Stetson" animsurface="RGFWATER_N_AIM" />
@@ -5397,15 +5559,20 @@
 			<Surface name="RGF_CROUCH_MORTAR_Stetson" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Stetson" animsurface="RGFSLAP" />			
 		</LayerProp>
-		<LayerProp filter="IsWearingBallcapAndHasPistol">
+		<LayerProp filter="BallcapAndPistolLeft" >
+			<Surface name="RGF_EMPTY_RUN_BCAP" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_BCAP" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="BallcapAndPistol" >
 			<Surface name="RGF_EMPTY_RUN_BCAP" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_BCAP" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_BCAP" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_BCAP" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_BCAP" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_BCAP" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_BCAP" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBallcapAndHasRifle">
+		<LayerProp filter="BallcapAndRifle">
 			<Surface name="RGF_RIFLE_OPEN_BCAP" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_BCAP" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_BCAP" animsurface="RGF_COWER_PRONE"/>
@@ -5422,7 +5589,7 @@
 			<Surface name="RGF_BLUNT_BCAP" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_BCAP" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBallcap">
+		<LayerProp filter="Ballcap">
 			<Surface name="RGF_RIFLE_IDLE_BCAP" animsurface="RGFSTANDING"/>
 			<Surface name="RGF_BASICWALK_BCAP" animsurface="RGFWALKING"/>
 			<Surface name="RGF_RUNNING_BCAP" animsurface="RGFRUNNING"/>
@@ -5538,16 +5705,20 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="facegear">
-		<LayerProp filter="IsWearingNVGandHasPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_NVG" animsurface="RGFNOTHING_WALK"/>
+		<LayerProp filter="NVGAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_NVG" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_NVG" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="NVGAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_NVG" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_NVG" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_NVG" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_NVG" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_NVG" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_NVG" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_NVG" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingNVGandHasRifle" palette="hats">
+		<LayerProp filter="NVGAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_NVG" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_NVG" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_NVG" animsurface="RGF_COWER_PRONE"/>
@@ -5564,7 +5735,7 @@
 			<Surface name="RGF_BLUNT_NVG" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_NVG" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingNVG" palette="hats">
+		<LayerProp filter="NVG" palette="hats">
 			<Surface name="RGF_RIFLE_WALK_CROUCH_NVG" animsurface="RGFCROUCH_R_RDY"/>
 			<Surface name="RGF_RIFLE_WALK_NVG" animsurface="RGFWALK_R_RDY"/>
 			<Surface name="RGF_RIFLE_IDLE_NVG" animsurface="RGFSTANDING"/>
@@ -5678,11 +5849,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_NVG" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_NVG" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="GogglesAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Goggles" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Goggles" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="GogglesAndPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_Goggles" animsurface="RGFNOTHING_WALK"/>
 			<Surface name="RGF_EMPTY_RUN_Goggles" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Goggles" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Goggles" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Goggles" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Goggles" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Goggles" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Goggles" animsurface="RGFWATER_N_AIM" />
@@ -5820,16 +5995,20 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="gasmask">
-		<LayerProp filter="IsWearingGasmaskAndHasPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_GMASK" animsurface="RGFNOTHING_WALK"/>
+		<LayerProp filter="GasmaskAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_GMASK" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_GMASK" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="GasmaskAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_GMASK" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_GMASK" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_GMASK" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_GMASK" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_GMASK" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_GMASK" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_GMASK" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGasmaskAndHasRifle" palette="hats">
+		<LayerProp filter="GasmaskAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_GMASK" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_GMASK" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_GMASK" animsurface="RGF_COWER_PRONE"/>
@@ -5846,7 +6025,7 @@
 			<Surface name="RGF_BLUNT_GMASK" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_GMASK" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGasmask" palette="hats">
+		<LayerProp filter="Gasmask" palette="hats">
 			<Surface name="RGF_RIFLE_WALK_CROUCH_GMASK" animsurface="RGFCROUCH_R_RDY"/>
 			<Surface name="RGF_RIFLE_WALK_GMASK" animsurface="RGFWALK_R_RDY"/>
 			<Surface name="RGF_RIFLE_IDLE_GMASK" animsurface="RGFSTANDING"/>
@@ -5962,11 +6141,15 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="ears">
+		<LayerProp filter="HeadSetAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Headset" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Headset" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="HeadSetAndPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_Headset" animsurface="RGFNOTHING_WALK"/>
 			<Surface name="RGF_EMPTY_RUN_Headset" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Headset" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Headset" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Headset" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Headset" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Headset" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Headset" animsurface="RGFWATER_N_AIM" />
@@ -6104,10 +6287,15 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="vest">
+		<LayerProp filter="EODvestAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_eod_v" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_eod_v" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="EODvestAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_eod_v" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_eod_v" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_eod_v" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_eod_v" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_eod_v" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_eod_v" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_eod_v" animsurface="RGFWATER_N_AIM" />
@@ -6243,18 +6431,20 @@
 			<Surface name="RGF_CROUCH_MORTAR_eod_v" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_eod_v" animsurface="RGFSLAP" />			
 		</LayerProp>
-		<LayerProp filter="IsWearingSpectraVestAndHasPistol" palette="hats">
-			<Surface name="RGF_PISTOL_IDLE_spectra" animsurface="RGFPISTOLBREATH"/>
-			<Surface name="RGF_EMPTY_WALK_spectra" animsurface="RGFNOTHING_WALK"/>
-			<Surface name="RGF_PISTOL_RDY_WALK_spectra" animsurface="RGFWALK_P_RDY"/>
+		<LayerProp filter="SpectraVestAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_spectra" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_spectra" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="SpectraVestAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_spectra" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_spectra" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_spectra" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_spectra" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_spectra" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_spectra" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_spectra" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingSpectraVestAndHasRifle" palette="hats">
+		<LayerProp filter="SpectraVestAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_spectra" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_spectra" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_spectra" animsurface="RGF_COWER_PRONE"/>
@@ -6308,6 +6498,8 @@
 			<Surface name="RGF_EMPTY_PRONE_spectra" animsurface="RGFHANDGUN_PRONE"/>
 			<Surface name="RGF_DUAL_PRONE_spectra" animsurface="RGFDWPRONE"/>
 			<Surface name="RGF_DUAL_RDY_WALK_spectra" animsurface="RGFWALK_D_RDY"/>
+			<Surface name="RGF_PISTOL_IDLE_spectra" animsurface="RGFPISTOLBREATH"/>
+			<Surface name="RGF_PISTOL_RDY_WALK_spectra" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_PISTOL_AIM_spectra" animsurface="RGFHANDGUN_S_SHOT"/>
 			<Surface name="RGF_PISTOL_AIM_1H_spectra" animsurface="RGF_PFSHOT_AIM"/>
 			<Surface name="RGF_PISTOL_LOW_spectra" animsurface="RGFPISTOLSHOOTLOW"/>
@@ -6384,18 +6576,20 @@
 			<Surface name="RGF_CROUCH_MORTAR_spectra" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_spectra" animsurface="RGFSLAP" />			
 		</LayerProp>
-		<LayerProp filter="IsWearingKevlarVestAndHasPistol" palette="hats">
-			<Surface name="RGF_PISTOL_IDLE_kevlar" animsurface="RGFPISTOLBREATH"/>
-			<Surface name="RGF_EMPTY_WALK_kevlar" animsurface="RGFNOTHING_WALK"/>
-			<Surface name="RGF_PISTOL_RDY_WALK_kevlar" animsurface="RGFWALK_P_RDY"/>
+		<LayerProp filter="KevlarVestAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_kevlar" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_kevlar" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="KevlarVestAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_kevlar" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_kevlar" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_kevlar" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_kevlar" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_kevlar" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_kevlar" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_kevlar" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingKevlarVestAndHasRifle" palette="hats">
+		<LayerProp filter="KevlarVestAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_kevlar" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_kevlar" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_kevlar" animsurface="RGF_COWER_PRONE"/>
@@ -6449,6 +6643,8 @@
 			<Surface name="RGF_EMPTY_PRONE_kevlar" animsurface="RGFHANDGUN_PRONE"/>
 			<Surface name="RGF_DUAL_PRONE_kevlar" animsurface="RGFDWPRONE"/>
 			<Surface name="RGF_DUAL_RDY_WALK_kevlar" animsurface="RGFWALK_D_RDY"/>
+			<Surface name="RGF_PISTOL_IDLE_kevlar" animsurface="RGFPISTOLBREATH"/>
+			<Surface name="RGF_PISTOL_RDY_WALK_kevlar" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_PISTOL_AIM_kevlar" animsurface="RGFHANDGUN_S_SHOT"/>
 			<Surface name="RGF_PISTOL_AIM_1H_kevlar" animsurface="RGF_PFSHOT_AIM"/>
 			<Surface name="RGF_PISTOL_LOW_kevlar" animsurface="RGFPISTOLSHOOTLOW"/>
@@ -6525,13 +6721,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_kevlar" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_kevlar" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="FlakVestAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Flakvest" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Flakvest" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="FlakVestAndPistol" palette="hats">
-			<Surface name="RGF_PISTOL_IDLE_Flakvest" animsurface="RGFPISTOLBREATH"/>
-			<Surface name="RGF_EMPTY_WALK_Flakvest" animsurface="RGFNOTHING_WALK"/>
-			<Surface name="RGF_PISTOL_RDY_WALK_Flakvest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_EMPTY_RUN_Flakvest" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Flakvest" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Flakvest" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Flakvest" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Flakvest" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Flakvest" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Flakvest" animsurface="RGFWATER_N_AIM" />
@@ -6590,6 +6788,8 @@
 			<Surface name="RGF_EMPTY_PRONE_Flakvest" animsurface="RGFHANDGUN_PRONE"/>
 			<Surface name="RGF_DUAL_PRONE_Flakvest" animsurface="RGFDWPRONE"/>
 			<Surface name="RGF_DUAL_RDY_WALK_Flakvest" animsurface="RGFWALK_D_RDY"/>
+			<Surface name="RGF_PISTOL_IDLE_Flakvest" animsurface="RGFPISTOLBREATH"/>
+			<Surface name="RGF_PISTOL_RDY_WALK_Flakvest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_PISTOL_AIM_Flakvest" animsurface="RGFHANDGUN_S_SHOT"/>
 			<Surface name="RGF_PISTOL_AIM_1H_Flakvest" animsurface="RGF_PFSHOT_AIM"/>
 			<Surface name="RGF_PISTOL_LOW_Flakvest" animsurface="RGFPISTOLSHOOTLOW"/>
@@ -6666,13 +6866,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Flakvest" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Flakvest" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="GuardianVestAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Guardvest" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Guardvest" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="GuardianVestAndPistol" palette="hats">
-			<Surface name="RGF_PISTOL_IDLE_Guardvest" animsurface="RGFPISTOLBREATH"/>
-			<Surface name="RGF_EMPTY_WALK_Guardvest" animsurface="RGFNOTHING_WALK"/>
-			<Surface name="RGF_PISTOL_RDY_WALK_Guardvest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_EMPTY_RUN_Guardvest" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Guardvest" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Guardvest" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Guardvest" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Guardvest" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Guardvest" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Guardvest" animsurface="RGFWATER_N_AIM" />
@@ -6731,6 +6933,8 @@
 			<Surface name="RGF_EMPTY_PRONE_Guardvest" animsurface="RGFHANDGUN_PRONE"/>
 			<Surface name="RGF_DUAL_PRONE_Guardvest" animsurface="RGFDWPRONE"/>
 			<Surface name="RGF_DUAL_RDY_WALK_Guardvest" animsurface="RGFWALK_D_RDY"/>
+			<Surface name="RGF_PISTOL_IDLE_Guardvest" animsurface="RGFPISTOLBREATH"/>
+			<Surface name="RGF_PISTOL_RDY_WALK_Guardvest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_PISTOL_AIM_Guardvest" animsurface="RGFHANDGUN_S_SHOT"/>
 			<Surface name="RGF_PISTOL_AIM_1H_Guardvest" animsurface="RGF_PFSHOT_AIM"/>
 			<Surface name="RGF_PISTOL_LOW_Guardvest" animsurface="RGFPISTOLSHOOTLOW"/>
@@ -6807,13 +7011,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Guardvest" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Guardvest" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="SWATVestAndPistolLeft" palette="swat_blue">
+			<Surface name="RGF_EMPTY_RUN_SWATvest" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_SWATvest" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="SWATVestAndPistol" palette="swat_blue">
-			<Surface name="RGF_PISTOL_IDLE_SWATvest" animsurface="RGFPISTOLBREATH"/>
-			<Surface name="RGF_EMPTY_WALK_SWATvest" animsurface="RGFNOTHING_WALK"/>
-			<Surface name="RGF_PISTOL_RDY_WALK_SWATvest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_EMPTY_RUN_SWATvest" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_SWATvest" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_SWATvest" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_SWATvest" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_SWATvest" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_SWATvest" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_SWATvest" animsurface="RGFWATER_N_AIM" />
@@ -6872,6 +7078,8 @@
 			<Surface name="RGF_EMPTY_PRONE_SWATvest" animsurface="RGFHANDGUN_PRONE"/>
 			<Surface name="RGF_DUAL_PRONE_SWATvest" animsurface="RGFDWPRONE"/>
 			<Surface name="RGF_DUAL_RDY_WALK_SWATvest" animsurface="RGFWALK_D_RDY"/>
+			<Surface name="RGF_PISTOL_IDLE_SWATvest" animsurface="RGFPISTOLBREATH"/>
+			<Surface name="RGF_PISTOL_RDY_WALK_SWATvest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_PISTOL_AIM_SWATvest" animsurface="RGFHANDGUN_S_SHOT"/>
 			<Surface name="RGF_PISTOL_AIM_1H_SWATvest" animsurface="RGF_PFSHOT_AIM"/>
 			<Surface name="RGF_PISTOL_LOW_SWATvest" animsurface="RGFPISTOLSHOOTLOW"/>
@@ -6948,13 +7156,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_SWATvest" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_SWATvest" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="ZylonVestAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Zylonvest" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Zylonvest" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="ZylonVestAndPistol" palette="hats">
-			<Surface name="RGF_PISTOL_IDLE_Zylonvest" animsurface="RGFPISTOLBREATH"/>
-			<Surface name="RGF_EMPTY_WALK_Zylonvest" animsurface="RGFNOTHING_WALK"/>
-			<Surface name="RGF_PISTOL_RDY_WALK_Zylonvest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_EMPTY_RUN_Zylonvest" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Zylonvest" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Zylonvest" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Zylonvest" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Zylonvest" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Zylonvest" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Zylonvest" animsurface="RGFWATER_N_AIM" />
@@ -7013,6 +7223,8 @@
 			<Surface name="RGF_EMPTY_PRONE_Zylonvest" animsurface="RGFHANDGUN_PRONE"/>
 			<Surface name="RGF_DUAL_PRONE_Zylonvest" animsurface="RGFDWPRONE"/>
 			<Surface name="RGF_DUAL_RDY_WALK_Zylonvest" animsurface="RGFWALK_D_RDY"/>
+			<Surface name="RGF_PISTOL_IDLE_Zylonvest" animsurface="RGFPISTOLBREATH"/>
+			<Surface name="RGF_PISTOL_RDY_WALK_Zylonvest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_PISTOL_AIM_Zylonvest" animsurface="RGFHANDGUN_S_SHOT"/>
 			<Surface name="RGF_PISTOL_AIM_1H_Zylonvest" animsurface="RGF_PFSHOT_AIM"/>
 			<Surface name="RGF_PISTOL_LOW_Zylonvest" animsurface="RGFPISTOLSHOOTLOW"/>
@@ -7089,13 +7301,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Zylonvest" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Zylonvest" animsurface="RGFSLAP" />
 		</LayerProp>
+		<LayerProp filter="TwaronVestAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Twavest" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Twavest" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="TwaronVestAndPistol" palette="hats">
-			<Surface name="RGF_PISTOL_IDLE_Twavest" animsurface="RGFPISTOLBREATH"/>
-			<Surface name="RGF_EMPTY_WALK_Twavest" animsurface="RGFNOTHING_WALK"/>
-			<Surface name="RGF_PISTOL_RDY_WALK_Twavest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_EMPTY_RUN_Twavest" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Twavest" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Twavest" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Twavest" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Twavest" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Twavest" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Twavest" animsurface="RGFWATER_N_AIM" />
@@ -7154,6 +7368,8 @@
 			<Surface name="RGF_EMPTY_PRONE_Twavest" animsurface="RGFHANDGUN_PRONE"/>
 			<Surface name="RGF_DUAL_PRONE_Twavest" animsurface="RGFDWPRONE"/>
 			<Surface name="RGF_DUAL_RDY_WALK_Twavest" animsurface="RGFWALK_D_RDY"/>
+			<Surface name="RGF_PISTOL_IDLE_Twavest" animsurface="RGFPISTOLBREATH"/>
+			<Surface name="RGF_PISTOL_RDY_WALK_Twavest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_PISTOL_AIM_Twavest" animsurface="RGFHANDGUN_S_SHOT"/>
 			<Surface name="RGF_PISTOL_AIM_1H_Twavest" animsurface="RGF_PFSHOT_AIM"/>
 			<Surface name="RGF_PISTOL_LOW_Twavest" animsurface="RGFPISTOLSHOOTLOW"/>
@@ -7230,13 +7446,15 @@
 			<Surface name="RGF_CROUCH_MORTAR_Twavest" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Twavest" animsurface="RGFSLAP" />			
 		</LayerProp>
+		<LayerProp filter="DyneemaVestAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Dynvest" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Dynvest" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
 		<LayerProp filter="DyneemaVestAndPistol" palette="hats">
-			<Surface name="RGF_PISTOL_IDLE_Dynvest" animsurface="RGFPISTOLBREATH"/>
-			<Surface name="RGF_EMPTY_WALK_Dynvest" animsurface="RGFNOTHING_WALK"/>
-			<Surface name="RGF_PISTOL_RDY_WALK_Dynvest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_EMPTY_RUN_Dynvest" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Dynvest" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Dynvest" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Dynvest" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Dynvest" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Dynvest" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Dynvest" animsurface="RGFWATER_N_AIM" />
@@ -7295,6 +7513,8 @@
 			<Surface name="RGF_EMPTY_PRONE_Dynvest" animsurface="RGFHANDGUN_PRONE"/>
 			<Surface name="RGF_DUAL_PRONE_Dynvest" animsurface="RGFDWPRONE"/>
 			<Surface name="RGF_DUAL_RDY_WALK_Dynvest" animsurface="RGFWALK_D_RDY"/>
+			<Surface name="RGF_PISTOL_IDLE_Dynvest" animsurface="RGFPISTOLBREATH"/>
+			<Surface name="RGF_PISTOL_RDY_WALK_Dynvest" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_PISTOL_AIM_Dynvest" animsurface="RGFHANDGUN_S_SHOT"/>
 			<Surface name="RGF_PISTOL_AIM_1H_Dynvest" animsurface="RGF_PFSHOT_AIM"/>
 			<Surface name="RGF_PISTOL_LOW_Dynvest" animsurface="RGFPISTOLSHOOTLOW"/>
@@ -7371,18 +7591,20 @@
 			<Surface name="RGF_CROUCH_MORTAR_Dynvest" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Dynvest" animsurface="RGFSLAP" />			
 		</LayerProp>
-		<LayerProp filter="IsWearingFlakJacketAndHasPistol" palette="hats">
-			<Surface name="RGF_PISTOL_IDLE_VEST" animsurface="RGFPISTOLBREATH"/>
-			<Surface name="RGF_EMPTY_WALK_VEST" animsurface="RGFNOTHING_WALK"/>
-			<Surface name="RGF_PISTOL_RDY_WALK_VEST" animsurface="RGFWALK_P_RDY"/>
+		<LayerProp filter="ChestRigAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_VEST" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_VEST" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="ChestRigAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_VEST" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_VEST" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_VEST" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_VEST" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_VEST" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_VEST" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_VEST" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingFlakJacketAndHasRifle" palette="hats">
+		<LayerProp filter="ChestRigAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_VEST" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_VEST" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_VEST" animsurface="RGF_COWER_PRONE"/>
@@ -7395,11 +7617,11 @@
 			<Surface name="RGF_RIFLE_SIDESTEP_AIM_VEST" animsurface="RGFSIDESTEP_R_RDY"/>
 			<Surface name="RGF_RIFLE_ROLL_SIDE_VEST" animsurface="RGFROLL_PR"/>
 		</LayerProp>
-		<LayerProp filter="FlakJacketAndBluntMeleeWeapon" palette="hats">
+		<LayerProp filter="ChestRigAndBluntMeleeWeapon" palette="hats">
 			<Surface name="RGF_BLUNT_VEST" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_VEST" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="FlakJacket" palette="hats">
+		<LayerProp filter="ChestRig" palette="hats">
 			<Surface name="RGF_RIFLE_WALK_CROUCH_VEST" animsurface="RGFCROUCH_R_RDY"/>
 			<Surface name="RGF_RIFLE_WALK_VEST" animsurface="RGFWALK_R_RDY"/>
 			<Surface name="RGF_RIFLE_IDLE_VEST" animsurface="RGFSTANDING"/>
@@ -7436,6 +7658,8 @@
 			<Surface name="RGF_EMPTY_PRONE_VEST" animsurface="RGFHANDGUN_PRONE"/>
 			<Surface name="RGF_DUAL_PRONE_VEST" animsurface="RGFDWPRONE"/>
 			<Surface name="RGF_DUAL_RDY_WALK_VEST" animsurface="RGFWALK_D_RDY"/>
+			<Surface name="RGF_PISTOL_IDLE_VEST" animsurface="RGFPISTOLBREATH"/>
+			<Surface name="RGF_PISTOL_RDY_WALK_VEST" animsurface="RGFWALK_P_RDY"/>
 			<Surface name="RGF_PISTOL_AIM_VEST" animsurface="RGFHANDGUN_S_SHOT"/>
 			<Surface name="RGF_PISTOL_AIM_1H_VEST" animsurface="RGF_PFSHOT_AIM"/>
 			<Surface name="RGF_PISTOL_LOW_VEST" animsurface="RGFPISTOLSHOOTLOW"/>
@@ -7515,16 +7739,20 @@
 	</Layer>
 	<Layer name="backpack">
 <!--
-		<LayerProp filter="IsWearingBigRadioSetAndHasPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_Bigradio" animsurface="RGFNOTHING_WALK"/>
+		<LayerProp filter="BigRadioSetAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Bigradio" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Bigradio" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="BigRadioSetAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_Bigradio" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Bigradio" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Bigradio" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Bigradio" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Bigradio" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Bigradio" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Bigradio" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBigRadioSetAndHasRifle" palette="hats">
+		<LayerProp filter="BigRadioSetAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_Bigradio" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_Bigradio" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_Bigradio" animsurface="RGF_COWER_PRONE"/>
@@ -7541,7 +7769,7 @@
 			<Surface name="RGF_BLUNT_Bigradio" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_Bigradio" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBigRadioSet" palette="hats">
+		<LayerProp filter="BigRadioSet" palette="hats">
 			<Surface name="RGF_RIFLE_WALK_CROUCH_Bigradio" animsurface="RGFCROUCH_R_RDY"/>
 			<Surface name="RGF_CROUCHWALK_Bigradio" animsurface="RGFCROUCH_P_RDY"/>
 			<Surface name="RGF_CROUCHWALK_DUAL_Bigradio" animsurface="RGFCROUCH_D_RDY"/>
@@ -7654,16 +7882,20 @@
 			<Surface name="RGF_SLAP_Bigradio" animsurface="RGFSLAP" />			
 		</LayerProp>
 -->
-		<LayerProp filter="IsWearingMedRadioSetAndHasPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_Medradio" animsurface="RGFNOTHING_WALK"/>
+		<LayerProp filter="MedRadioSetAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_Medradio" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_Medradio" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="MedRadioSetAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_Medradio" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_Medradio" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_Medradio" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_Medradio" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_Medradio" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_Medradio" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_Medradio" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingMedRadioSetAndHasRifle" palette="hats">
+		<LayerProp filter="MedRadioSetAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_Medradio" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_Medradio" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_Medradio" animsurface="RGF_COWER_PRONE"/>
@@ -7680,7 +7912,7 @@
 			<Surface name="RGF_BLUNT_Medradio" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_Medradio" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingMedRadioSet" palette="hats">
+		<LayerProp filter="MedRadioSet" palette="hats">
 			<Surface name="RGF_RIFLE_WALK_CROUCH_Medradio" animsurface="RGFCROUCH_R_RDY"/>
 			<Surface name="RGF_CROUCHWALK_Medradio" animsurface="RGFCROUCH_P_RDY"/>
 			<Surface name="RGF_CROUCHWALK_DUAL_Medradio" animsurface="RGFCROUCH_D_RDY"/>
@@ -7792,16 +8024,20 @@
 			<Surface name="RGF_CROUCH_MORTAR_Medradio" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_Medradio" animsurface="RGFSLAP" />			
 		</LayerProp>
-		<LayerProp filter="IsWearingCombatPackAndHasPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_CP" animsurface="RGFNOTHING_WALK"/>
+		<LayerProp filter="CombatPackAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_CP" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_CP" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="CombatPackAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_CP" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_CP" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_CP" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_CP" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_CP" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_CP" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_CP" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCombatPackAndHasRifle" palette="hats">
+		<LayerProp filter="CombatPackAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_CP" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_CP" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_CP" animsurface="RGF_COWER_PRONE"/>
@@ -7818,7 +8054,7 @@
 			<Surface name="RGF_BLUNT_CP" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_CP" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCombatPack" palette="hats">
+		<LayerProp filter="CombatPack" palette="hats">
 			<Surface name="RGF_RIFLE_WALK_CROUCH_CP" animsurface="RGFCROUCH_R_RDY"/>
 			<Surface name="RGF_CROUCHWALK_CP" animsurface="RGFCROUCH_P_RDY"/>
 			<Surface name="RGF_CROUCHWALK_DUAL_CP" animsurface="RGFCROUCH_D_RDY"/>
@@ -7930,16 +8166,20 @@
 			<Surface name="RGF_CROUCH_MORTAR_CP" animsurface="RGFMORTAR" />
 			<Surface name="RGF_SLAP_CP" animsurface="RGFSLAP" />			
 		</LayerProp>
-		<LayerProp filter="IsWearingBackpackAndHasPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_BP" animsurface="RGFNOTHING_WALK"/>
+		<LayerProp filter="BackpackAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_BP" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_BP" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="BackpackAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_BP" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_BP" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_BP" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_BP" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_BP" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_BP" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_BP" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBackpackAndHasRifle" palette="hats">
+		<LayerProp filter="BackpackAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_BP" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_BP" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_BP" animsurface="RGF_COWER_PRONE"/>
@@ -7956,7 +8196,7 @@
 			<Surface name="RGF_BLUNT_BP" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_BP" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBackpack" palette="hats">
+		<LayerProp filter="Backpack" palette="hats">
 			<Surface name="RGF_RIFLE_WALK_CROUCH_BP" animsurface="RGFCROUCH_R_RDY"/>
 			<Surface name="RGF_CROUCHWALK_BP" animsurface="RGFCROUCH_P_RDY"/>
 			<Surface name="RGF_CROUCHWALK_DUAL_BP" animsurface="RGFCROUCH_D_RDY"/>
@@ -8070,16 +8310,20 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="legrig">
-		<LayerProp filter="HasHolsterAndPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_holster" animsurface="RGFNOTHING_WALK"/>
+		<LayerProp filter="HolsterAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_holster" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_holster" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="HolsterAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_holster" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_holster" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_holster" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_holster" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_holster" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_holster" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_holster" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="HasHolsterAndRifle" palette="hats">
+		<LayerProp filter="HolsterAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_holster" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_holster" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_holster" animsurface="RGF_COWER_PRONE"/>
@@ -8209,16 +8453,20 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="legrig_left">
-		<LayerProp filter="HasLeftHolsterAndPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_holster_l" animsurface="RGFNOTHING_WALK"/>
+		<LayerProp filter="LeftHolsterAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_holster_l" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_holster_l" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="LeftHolsterAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_holster_l" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_holster_l" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_holster_l" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_holster_l" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_holster_l" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_holster_l" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_holster_l" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="HasLeftHolsterAndRifle" palette="hats">
+		<LayerProp filter="LeftHolsterAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_holster_l" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_holster_l" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_holster_l" animsurface="RGF_COWER_PRONE"/>
@@ -8235,7 +8483,7 @@
 			<Surface name="RGF_BLUNT_holster_l" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_holster_l" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="HolsterLeft" palette="hats">
+		<LayerProp filter="LeftHolster" palette="hats">
 			<Surface name="RGF_RIFLE_WALK_CROUCH_holster_l" animsurface="RGFCROUCH_R_RDY"/>
 			<Surface name="RGF_CROUCHWALK_holster_l" animsurface="RGFCROUCH_P_RDY"/>
 			<Surface name="RGF_CROUCHWALK_DUAL_holster_l" animsurface="RGFCROUCH_D_RDY"/>
@@ -8348,16 +8596,20 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="knees">
-		<LayerProp filter="HasKneepadsAndHasPistol" palette="hats">
-			<Surface name="RGF_EMPTY_WALK_PADS" animsurface="RGFNOTHING_WALK"/>
+		<LayerProp filter="KneepadsAndPistolLeft" palette="hats">
+			<Surface name="RGF_EMPTY_RUN_PADS" animsurface="RGFPISTOL_RUN"/>
+			<Surface name="RGF_DUAL_SDSTP_PADS" animsurface="RGFSIDESTEP"/>
+		</LayerProp>
+		<LayerProp filter="KneepadsAndPistol" palette="hats">
 			<Surface name="RGF_EMPTY_RUN_PADS" animsurface="RGFPISTOL_RUN"/>
 			<Surface name="RGF_EMPTY_RUN_PADS" animsurface="RGFNOTHING_RUN"/>
 			<Surface name="RGF_PISTOL_SDSTP_PADS" animsurface="RGFSIDESTEP"/>
+			<Surface name="RGF_EMPTY_DRUNK_PADS" animsurface="RGFPISTOLDRUNK"/>
 			<Surface name="RGF_WATER_PISTOL_IDLE_PADS" animsurface="RGFWATER_N_STD" />
 			<Surface name="RGF_WATER_EMPTY_WALK_PADS" animsurface="RGFWATER_N_WALK" />
 			<Surface name="RGF_WATER_PISTOL_AIM_PADS" animsurface="RGFWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="HasKneepadsAndHasRifle" palette="hats">
+		<LayerProp filter="KneepadsAndRifle" palette="hats">
 			<Surface name="RGF_RIFLE_OPEN_PADS" animsurface="RGFOPEN"/>
 			<Surface name="RGF_RIFLE_COWER_PADS" animsurface="RGFCOWER"/>
 			<Surface name="RGF_RIFLE_PRN_COWER_PADS" animsurface="RGF_COWER_PRONE"/>
@@ -8374,7 +8626,7 @@
 			<Surface name="RGF_BLUNT_PADS" animsurface="RGFPUNCH" />
 			<Surface name="RGF_CROWBAR_CR_HIT_PADS" animsurface="RGFPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="HasKneepads" palette="hats">
+		<LayerProp filter="Kneepads" palette="hats">
 			<Surface name="RGF_RIFLE_WALK_CROUCH_PADS" animsurface="RGFCROUCH_R_RDY"/>
 			<Surface name="RGF_CROUCHWALK_PADS" animsurface="RGFCROUCH_P_RDY"/>
 			<Surface name="RGF_CROUCHWALK_DUAL_PADS" animsurface="RGFCROUCH_D_RDY"/>
diff --git a/gamedir/Data/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_RGM_gear.xml b/gamedir/Data/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_RGM_gear.xml
index 8f61b7cc1..a4b0ce266 100644
--- a/gamedir/Data/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_RGM_gear.xml
+++ b/gamedir/Data/TableData/LogicalBodyTypes/LBT_RGM/LogicalBodyType_RGM_gear.xml
@@ -549,11 +549,16 @@
 			<Surface name="WATER_DUAL_AIM_LEGS_C" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_LEGS_C" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="SWATLeggingsAndPistolLeft" palette="swat_blue">
+			<Surface name="RGMEMPTY_RUN_SWATlegs" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_SWATlegs" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="SWATLeggingsAndPistol" palette="swat_blue">
 			<Surface name="RGMPISTOL_WALK_SWATlegs" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_SWATlegs" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_SWATlegs" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_SWATlegs" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_SWATlegs" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_SWATlegs" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_SWATlegs" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_SWATlegs" animsurface="RGMWATER_N_AIM" />
@@ -682,11 +687,16 @@
 			<Surface name="WATER_DUAL_AIM_SWATlegs" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_SWATlegs" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="ZylonPantsAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Zylonlegs" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Zylonlegs" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="ZylonPantsAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Zylonlegs" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Zylonlegs" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Zylonlegs" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Zylonlegs" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Zylonlegs" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Zylonlegs" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Zylonlegs" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Zylonlegs" animsurface="RGMWATER_N_AIM" />
@@ -952,11 +962,16 @@
 			<Surface name="WATER_DUAL_AIM_eod_l" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_eod_l" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="DressUniformPantsAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Dresslegs" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Dresslegs" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="DressUniformPantsAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Dresslegs" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Dresslegs" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Dresslegs" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Dresslegs" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Dresslegs" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Dresslegs" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Dresslegs" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Dresslegs" animsurface="RGMWATER_N_AIM" />
@@ -1087,11 +1102,16 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="legarmor">
+		<LayerProp filter="KevlarLeggingsAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Kvlrlegs" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Kvlrlegs" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="KevlarLeggingsAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Kvlrlegs" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Kvlrlegs" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Kvlrlegs" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Kvlrlegs" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Kvlrlegs" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Kvlrlegs" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Kvlrlegs" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Kvlrlegs" animsurface="RGMWATER_N_AIM" />
@@ -1220,11 +1240,16 @@
 			<Surface name="WATER_DUAL_AIM_Kvlrlegs" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Kvlrlegs" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="SpectraLeggingsAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Speclegs" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Speclegs" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="SpectraLeggingsAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Speclegs" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Speclegs" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Speclegs" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Speclegs" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Speclegs" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Speclegs" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Speclegs" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Speclegs" animsurface="RGMWATER_N_AIM" />
@@ -1353,11 +1378,16 @@
 			<Surface name="WATER_DUAL_AIM_Speclegs" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Speclegs" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="TwaronLeggingsAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Twalegs" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Twalegs" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="TwaronLeggingsAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Twalegs" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Twalegs" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Twalegs" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Twalegs" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Twalegs" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Twalegs" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Twalegs" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Twalegs" animsurface="RGMWATER_N_AIM" />
@@ -1486,11 +1516,16 @@
 			<Surface name="WATER_DUAL_AIM_Twalegs" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Twalegs" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="DyneemaLeggingsAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Dynlegs" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Dynlegs" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="DyneemaLeggingsAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Dynlegs" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Dynlegs" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Dynlegs" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Dynlegs" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Dynlegs" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Dynlegs" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Dynlegs" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Dynlegs" animsurface="RGMWATER_N_AIM" />
@@ -2185,13 +2220,16 @@
 			<Surface name="WATER_DUAL_AIM_TORSO_C" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_TORSO_C" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="DressUniformVestAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Dressvest" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Dressvest" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="DressUniformVestAndPistol" palette="hats">
-			<Surface name="RGMPISTOL_IDLE_Dressvest" animsurface="RGMPISTOLBREATH" />
 			<Surface name="RGMPISTOL_WALK_Dressvest" animsurface="RGMNOTHING_WALK" />
-			<Surface name="RGMPISTOL_RDY_WALK_Dressvest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMEMPTY_RUN_Dressvest" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Dressvest" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Dressvest" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Dressvest" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Dressvest" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Dressvest" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Dressvest" animsurface="RGMWATER_N_AIM" />
@@ -2215,22 +2253,21 @@
 			<Surface name="RGMCROWBAR_CR_HIT_Dressvest" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
 		<LayerProp filter="DressUniformVest" palette="hats">
+			<Surface name="RGMRIFLE_SWAT_Dressvest" animsurface="RGMSNEAKING" />
 			<Surface name="RGMRIFLE_WALK_CROUCH_Dressvest" animsurface="RGMCROUCH_R_RDY" />
+			<Surface name="RGM_CROUCHWALK_Dressvest" animsurface="RGMCROUCH_P_RDY" />
+			<Surface name="RGM_CROUCHWALK_DUAL_Dressvest" animsurface="RGMCROUCH_D_RDY" />
 			<Surface name="RGMRIFLE_WALK_Dressvest" animsurface="RGMWALK_R_RDY" />
+			<Surface name="RGMRUNNING_Dressvest" animsurface="RGMRUNNING" />
 			<Surface name="RGMRIFLE_IDLE_Dressvest" animsurface="RGMSTANDING" />
 			<Surface name="RGMBASICWALK_Dressvest" animsurface="RGMBASICWALKING" />
-			<Surface name="RGMRUNNING_Dressvest" animsurface="RGMRUNNING" />
 			<Surface name="RGMRIFLE_CROUCH_Dressvest" animsurface="RGMCROUCHING" />
 			<Surface name="RGMRIFLE_SIDESTEP_Dressvest" animsurface="RGMSIDESTEP" />
-			<Surface name="RGMRIFLE_SWAT_Dressvest" animsurface="RGMSNEAKING" />
 			<Surface name="RGMRIFLE_RAISE_Dressvest" animsurface="RGMRAISE" />
 			<Surface name="RGMRIFLE_AIM_Dressvest" animsurface="RGMSTANDAIM" />
 			<Surface name="RGMRIFLE_HIP_Dressvest" animsurface="RGM_HIP_AIM" />
 			<Surface name="RGMRIFLE_CR_AIM_Dressvest" animsurface="RGMCROUCHAIM" />
 			<Surface name="RGMRIFLE_PRONE_Dressvest" animsurface="RGMPRONE" />
-			<Surface name="RGMRIFLE_HIT_Dressvest" animsurface="RGMRHIT" />
-			<Surface name="RGM_CROUCHWALK_Dressvest" animsurface="RGMCROUCH_P_RDY" />
-			<Surface name="RGM_CROUCHWALK_DUAL_Dressvest" animsurface="RGMCROUCH_D_RDY" />
 			<Surface name="RGM_HOP_Dressvest" animsurface="RGMHOPFENCE" />
 			<Surface name="RGM_HOP_Dressvest" animsurface="RGMJUMPWINDOWS" />
 			<Surface name="RGM_PUNCH_Dressvest" animsurface="RGMPUNCH" />
@@ -2240,27 +2277,29 @@
 			<Surface name="RGM_OPEN_Dressvest" animsurface="RGMOPEN" />
 			<Surface name="RGM_PICKUP_Dressvest" animsurface="RGMPICKUP" />
 			<Surface name="RGMMEDIC_CROUCH_Dressvest" animsurface="RGMMEDIC" />
-			<Surface name="RGMMEDIC_PRONE_Dressvest" animsurface="RGMMEDICPRN" />
-			<Surface name="RGMCOWER_PRONE_Dressvest" animsurface="RGM_COWER_PRONE" />
-			<Surface name="RGMDIE_PRONE_Dressvest" animsurface="RGMHITPRONE" />
+			<Surface name="RGMRIFLE_HIT_Dressvest" animsurface="RGMRHIT" />
 			<Surface name="RGMEMPTY_CROUCH_Dressvest" animsurface="RGMNOTHING_CROUCH" />
 			<Surface name="RGMEMPTY_SWAT_Dressvest" animsurface="RGMNOTHING_SWAT" />
 			<Surface name="RGMEMPTY_SWAT_Dressvest" animsurface="RGMSWKNIFE" />
-			<Surface name="RGMEMPTY_RUN_Dressvest" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Dressvest" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMEMPTY_WALK_Dressvest" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_PRONE_Dressvest" animsurface="RGMHANDGUN_PRONE" />
-			<Surface name="RGMDUAL_PRONE_Dressvest" animsurface="RGMDWPRONE" />
-			<Surface name="RGMDUAL_RDY_WALK_Dressvest" animsurface="RGMWALK_D_RDY" />
+			<Surface name="RGMPISTOL_IDLE_Dressvest" animsurface="RGMPISTOLBREATH" />
 			<Surface name="RGMPISTOL_AIM_Dressvest" animsurface="RGMHANDGUN_S_SHOT" />
 			<Surface name="RGMPISTOL_AIM_1H_Dressvest" animsurface="RGM_PFSHOT_AIM" />
-			<Surface name="RGMPISTOL_LOW_Dressvest" animsurface="RGMPISTOLSHOOTLOW" />
-			<Surface name="RGMPISTOL_LOW_Dressvest" animsurface="RGMSHOOT_LOW" />
+			<Surface name="RGMPISTOL_RDY_WALK_Dressvest" animsurface="RGMWALK_P_RDY" />
+			<Surface name="RGMDUAL_RDY_WALK_Dressvest" animsurface="RGMWALK_D_RDY" />
 			<Surface name="RGMPISTOL_CR_AIM_Dressvest" animsurface="RGMHANDGUN_C_SHOT" />		
-			<Surface name="RGMDUAL_CR_AIM_Dressvest" animsurface="RGMCDBLSHOT" />
 			<Surface name="RGMPISTOL_SDSTP_AIM_Dressvest" animsurface="RGMSIDESTEP_P_RDY" />
 			<Surface name="RGMDUAL_SDSTP_AIM_Dressvest" animsurface="RGMSIDESTEP_D_RDY" />
+			<Surface name="RGMPISTOL_LOW_Dressvest" animsurface="RGMPISTOLSHOOTLOW" />
+			<Surface name="RGMPISTOL_LOW_Dressvest" animsurface="RGMSHOOT_LOW" />
 			<Surface name="RGMDUAL_AIM_Dressvest" animsurface="RGMSTANDDWALAIM" />
+			<Surface name="RGMDUAL_CR_AIM_Dressvest" animsurface="RGMCDBLSHOT" />
+			<Surface name="RGMMEDIC_PRONE_Dressvest" animsurface="RGMMEDICPRN" />
+			<Surface name="RGMCOWER_PRONE_Dressvest" animsurface="RGM_COWER_PRONE" />
+			<Surface name="RGMDIE_PRONE_Dressvest" animsurface="RGMHITPRONE" />
+			<Surface name="RGMDUAL_PRONE_Dressvest" animsurface="RGMDWPRONE" />
 			<Surface name="RGMEMPTY_PAIN_Dressvest" animsurface="RGMHURTSTANDINGN" />
 			<Surface name="RGMRIFLE_PAIN_Dressvest" animsurface="RGMHURTSTANDINGR" />
 			<Surface name="RGMEMPTY_DIE_Dressvest" animsurface="RGMHITSTAND" />
@@ -2324,11 +2363,11 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="hands">
-		<LayerProp filter="LongsleevesANDHasPistolOrMPistolInLeftHand" >
+		<LayerProp filter="LongsleevesAndPistolLeft" >
 			<Surface name="RGMEMPTY_RUN_LSLEEVE" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMDUAL_SDSTP_LSLEEVE" animsurface="RGMSIDESTEP" />
 		</LayerProp>
-		<LayerProp filter="LongsleevesANDHasPistolOrMPistolInRightHand" >
+		<LayerProp filter="LongsleevesAndPistol" >
 			<Surface name="RGMPISTOL_WALK_LSLEEVE" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_LSLEEVE" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_LSLEEVE" animsurface="RGMNOTHING_RUN" />
@@ -2338,7 +2377,7 @@
 			<Surface name="WATER_PISTOL_WALK_LSLEEVE" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_LSLEEVE" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="LongsleevesANDHasRifleTypeWeaponInHand" >
+		<LayerProp filter="LongsleevesAndRifle" >
 			<Surface name="RGM_RIFLE_OPEN_LSLEEVE" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_LSLEEVE" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_LSLEEVE" animsurface="RGM_COWER_PRONE" />
@@ -2467,16 +2506,21 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="head">
-		<LayerProp filter="IsWearingBalaclavaAndHasPistol">
+		<LayerProp filter="BalaclavaAndPistolLeft">
+			<Surface name="RGMEMPTY_RUN_balaclava" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_balaclava" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="BalaclavaAndPistol">
 			<Surface name="RGMPISTOL_WALK_balaclava" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_balaclava" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_balaclava" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_balaclava" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_balaclava" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_balaclava" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_balaclava" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_balaclava" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBalaclavaAndHasRifle">
+		<LayerProp filter="BalaclavaAndRifle">
 			<Surface name="RGM_RIFLE_OPEN_balaclava" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_balaclava" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_balaclava" animsurface="RGM_COWER_PRONE" />
@@ -2490,7 +2534,7 @@
 			<Surface name="RGMRIFLE_SIDESTEP_AIM_balaclava" animsurface="RGMSIDESTEP_R_RDY" />
 			<Surface name="RGMRIFLE_ROLL_SIDE_balaclava" animsurface="RGMROLL_PR" />
 		</LayerProp>
-		<LayerProp filter="BalaclavaAndBluntMeleeWeapon" >
+		<LayerProp filter="BalaclavaAndBluntMeleeWeapon">
 			<Surface name="RGM_BLUNT_balaclava" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_balaclava" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
@@ -2605,11 +2649,16 @@
 		</LayerProp> 
 	</Layer>
 	<Layer name="helmet">
+		<LayerProp filter="GhillieHoodAndPistolLeft" palette="WoodlandCamo">
+			<Surface name="RGMEMPTY_RUN_GHILLIEHOOD" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_GHILLIEHOOD" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="GhillieHoodAndPistol" palette="WoodlandCamo">
 			<Surface name="RGMPISTOL_WALK_GHILLIEHOOD" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_GHILLIEHOOD" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_GHILLIEHOOD" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_GHILLIEHOOD" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_GHILLIEHOOD" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_GHILLIEHOOD" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_GHILLIEHOOD" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_GHILLIEHOOD" animsurface="RGMWATER_N_AIM" />
@@ -2756,11 +2805,16 @@
 			<Surface name="RGMEMPTY_ROLL_SIDE_eod_h2" animsurface="RGMROLL_PR" />
 			<Surface name="RGMRIFLE_PRN_COWER_eod_h2" animsurface="RGM_COWER_PRONE" />
 		</LayerProp>
+		<LayerProp filter="EODhelmetAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_eod_h" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_eod_h" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="EODhelmetAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_eod_h" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_eod_h" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_eod_h" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_eod_h" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_eod_h" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_eod_h" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_eod_h" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_eod_h" animsurface="RGMWATER_N_AIM" />
@@ -2892,16 +2946,21 @@
 			<Surface name="WATER_DUAL_AIM_eod_h" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_eod_h" animsurface="RGMMORTAR" />
 		</LayerProp> 
-		<LayerProp filter="IsWearingCamoHelmetAndHasPistol" palette="WoodlandCamo">
+		<LayerProp filter="CamoHelmetAndPistolLeft" palette="WoodlandCamo">
+			<Surface name="RGMEMPTY_RUN_CAMOHELMET" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_CAMOHELMET" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="CamoHelmetAndPistol" palette="WoodlandCamo">
 			<Surface name="RGMPISTOL_WALK_CAMOHELMET" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_CAMOHELMET" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_CAMOHELMET" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_CAMOHELMET" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_CAMOHELMET" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_CAMOHELMET" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_CAMOHELMET" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_CAMOHELMET" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCamoHelmetAndHasRifle" palette="WoodlandCamo">
+		<LayerProp filter="CamoHelmetAndRifle" palette="WoodlandCamo">
 			<Surface name="RGM_RIFLE_OPEN_CAMOHELMET" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_CAMOHELMET" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_CAMOHELMET" animsurface="RGM_COWER_PRONE" />
@@ -2919,7 +2978,7 @@
 			<Surface name="RGM_BLUNT_CAMOHELMET" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_CAMOHELMET" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCamoHelmet" palette="WoodlandCamo">
+		<LayerProp filter="CamoHelmet" palette="WoodlandCamo">
 			<Surface name="RGMRIFLE_WALK_CROUCH_CAMOHELMET" animsurface="RGMCROUCH_R_RDY" />
 			<Surface name="RGMRIFLE_WALK_CAMOHELMET" animsurface="RGMWALK_R_RDY" />
 			<Surface name="RGMRIFLE_IDLE_CAMOHELMET" animsurface="RGMSTANDING" />
@@ -3028,11 +3087,16 @@
 			<Surface name="WATER_DUAL_AIM_CAMOHELMET" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_CAMOHELMET" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="SteelHelmetAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Steelhelm" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Steelhelm" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="SteelHelmetAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Steelhelm" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Steelhelm" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Steelhelm" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Steelhelm" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Steelhelm" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Steelhelm" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Steelhelm" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Steelhelm" animsurface="RGMWATER_N_AIM" />
@@ -3164,11 +3228,16 @@
 			<Surface name="WATER_DUAL_AIM_Steelhelm" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Steelhelm" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="KevlarHelmetAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Kvlrhelm" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Kvlrhelm" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="KevlarHelmetAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Kvlrhelm" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Kvlrhelm" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Kvlrhelm" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Kvlrhelm" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Kvlrhelm" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Kvlrhelm" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Kvlrhelm" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Kvlrhelm" animsurface="RGMWATER_N_AIM" />
@@ -3300,11 +3369,16 @@
 			<Surface name="WATER_DUAL_AIM_Kvlrhelm" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Kvlrhelm" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="SpectraHelmetAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Spechelm" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Spechelm" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="SpectraHelmetAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Spechelm" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Spechelm" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Spechelm" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Spechelm" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Spechelm" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Spechelm" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Spechelm" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Spechelm" animsurface="RGMWATER_N_AIM" />
@@ -3436,11 +3510,16 @@
 			<Surface name="WATER_DUAL_AIM_Spechelm" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Spechelm" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="SWATHelmetAndPistolLeft" palette="swat_blue">
+			<Surface name="RGMEMPTY_RUN_SWAThelm" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_SWAThelm" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="SWATHelmetAndPistol" palette="swat_blue">
 			<Surface name="RGMPISTOL_WALK_SWAThelm" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_SWAThelm" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_SWAThelm" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_SWAThelm" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_SWAThelm" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_SWAThelm" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_SWAThelm" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_SWAThelm" animsurface="RGMWATER_N_AIM" />
@@ -3572,11 +3651,16 @@
 			<Surface name="WATER_DUAL_AIM_SWAThelm" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_SWAThelm" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="TwaronHelmetAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Twahelm" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Twahelm" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="TwaronHelmetAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Twahelm" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Twahelm" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Twahelm" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Twahelm" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Twahelm" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Twahelm" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Twahelm" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Twahelm" animsurface="RGMWATER_N_AIM" />
@@ -3708,11 +3792,16 @@
 			<Surface name="WATER_DUAL_AIM_Twahelm" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Twahelm" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="DyneemaHelmetAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Dynhelm" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Dynhelm" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="DyneemaHelmetAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Dynhelm" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Dynhelm" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Dynhelm" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Dynhelm" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Dynhelm" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Dynhelm" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Dynhelm" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Dynhelm" animsurface="RGMWATER_N_AIM" />
@@ -3844,16 +3933,21 @@
 			<Surface name="WATER_DUAL_AIM_Dynhelm" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Dynhelm" animsurface="RGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHelmetAndHasPistol" palette="hats">
+		<LayerProp filter="HelmetAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_HELMET" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_HELMET" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="HelmetAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_HELMET" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_HELMET" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_HELMET" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_HELMET" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_HELMET" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_HELMET" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_HELMET" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_HELMET" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHelmetAndHasRifle" palette="hats">
+		<LayerProp filter="HelmetAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_HELMET" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_HELMET" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_HELMET" animsurface="RGM_COWER_PRONE" />
@@ -3871,7 +3965,7 @@
 			<Surface name="RGM_BLUNT_HELMET" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_HELMET" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHelmet" palette="hats">
+		<LayerProp filter="Helmet" palette="hats">
 			<Surface name="RGMRIFLE_WALK_CROUCH_HELMET" animsurface="RGMCROUCH_R_RDY" />
 			<Surface name="RGMRIFLE_WALK_HELMET" animsurface="RGMWALK_R_RDY" />
 			<Surface name="RGMRIFLE_IDLE_HELMET" animsurface="RGMSTANDING" />
@@ -3980,16 +4074,21 @@
 			<Surface name="WATER_DUAL_AIM_HELMET" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_HELMET" animsurface="RGMMORTAR" />
 		</LayerProp> 
-		<LayerProp filter="IsWearingRedBeretAndHasPistol" palette="hats">
+		<LayerProp filter="RedBeretAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_BERET" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_BERET" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="RedBeretAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_BERET" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_BERET" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_BERET" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_BERET" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_BERET" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_BERET" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_BERET" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_BERET" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingRedBeretAndHasRifle" palette="hats">
+		<LayerProp filter="RedBeretAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_BERET" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_BERET" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_BERET" animsurface="RGM_COWER_PRONE" />
@@ -4007,7 +4106,7 @@
 			<Surface name="RGM_BLUNT_BERET" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_BERET" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingRedBeret" palette="hats">
+		<LayerProp filter="RedBeret" palette="hats">
 			<Surface name="RGMRIFLE_IDLE_BERET" animsurface="RGMSTANDING" />
 			<Surface name="RGMBASICWALK_BERET" animsurface="RGMBASICWALKING" />
 			<Surface name="RGMRUNNING_BERET" animsurface="RGMRUNNING" />
@@ -4116,16 +4215,21 @@
 			<Surface name="WATER_DUAL_AIM_BERET" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_BERET" animsurface="RGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGreenBeretAndHasPistol" palette="Greenhats">
+		<LayerProp filter="GreenBeretAndPistolLeft" palette="Greenhats">
+			<Surface name="RGMEMPTY_RUN_BERET" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_BERET" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="GreenBeretAndPistol" palette="Greenhats">
 			<Surface name="RGMPISTOL_WALK_BERET" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_BERET" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_BERET" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_BERET" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_BERET" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_BERET" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_BERET" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_BERET" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGreenBeretAndHasRifle" palette="Greenhats">
+		<LayerProp filter="GreenBeretAndRifle" palette="Greenhats">
 			<Surface name="RGM_RIFLE_OPEN_BERET" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_BERET" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_BERET" animsurface="RGM_COWER_PRONE" />
@@ -4143,7 +4247,7 @@
 			<Surface name="RGM_BLUNT_BERET" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_BERET" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGreenBeret" palette="Greenhats">
+		<LayerProp filter="GreenBeret" palette="Greenhats">
 			<Surface name="RGMRIFLE_IDLE_BERET" animsurface="RGMSTANDING" />
 			<Surface name="RGMBASICWALK_BERET" animsurface="RGMBASICWALKING" />
 			<Surface name="RGMRUNNING_BERET" animsurface="RGMRUNNING" />
@@ -4252,16 +4356,21 @@
 			<Surface name="WATER_DUAL_AIM_BERET" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_BERET" animsurface="RGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBlueBeretAndHasPistol" palette="Bluehats">
+		<LayerProp filter="BlueBeretAndPistolLeft" palette="Bluehats">
+			<Surface name="RGMEMPTY_RUN_BERET" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_BERET" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="BlueBeretAndPistol" palette="Bluehats">
 			<Surface name="RGMPISTOL_WALK_BERET" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_BERET" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_BERET" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_BERET" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_BERET" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_BERET" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_BERET" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_BERET" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBlueBeretAndHasRifle" palette="Bluehats">
+		<LayerProp filter="BlueBeretAndRifle" palette="Bluehats">
 			<Surface name="RGM_RIFLE_OPEN_BERET" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_BERET" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_BERET" animsurface="RGM_COWER_PRONE" />
@@ -4279,7 +4388,7 @@
 			<Surface name="RGM_BLUNT_BERET" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_BERET" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBlueBeret" palette="Bluehats">
+		<LayerProp filter="BlueBeret" palette="Bluehats">
 			<Surface name="RGMRIFLE_IDLE_BERET" animsurface="RGMSTANDING" />
 			<Surface name="RGMBASICWALK_BERET" animsurface="RGMBASICWALKING" />
 			<Surface name="RGMRUNNING_BERET" animsurface="RGMRUNNING" />
@@ -4388,16 +4497,21 @@
 			<Surface name="WATER_DUAL_AIM_BERET" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_BERET" animsurface="RGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHatAndHasPistol" palette="WoodlandCamo">
+		<LayerProp filter="BooneyHatAndPistolLeft" palette="WoodlandCamo">
+			<Surface name="RGMEMPTY_RUN_BOONEY" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_BOONEY" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="BooneyHatAndPistol" palette="WoodlandCamo">
 			<Surface name="RGMPISTOL_WALK_BOONEY" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_BOONEY" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_BOONEY" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_BOONEY" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_BOONEY" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_BOONEY" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_BOONEY" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_BOONEY" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHatAndHasRifle" palette="WoodlandCamo">
+		<LayerProp filter="BooneyHatAndRifle" palette="WoodlandCamo">
 			<Surface name="RGM_RIFLE_OPEN_BOONEY" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_BOONEY" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_BOONEY" animsurface="RGM_COWER_PRONE" />
@@ -4411,11 +4525,11 @@
 			<Surface name="RGMRIFLE_SIDESTEP_AIM_BOONEY" animsurface="RGMSIDESTEP_R_RDY" />
 			<Surface name="RGMRIFLE_ROLL_SIDE_BOONEY" animsurface="RGMROLL_PR" />
 		</LayerProp>
-		<LayerProp filter="HatAndBluntMeleeWeapon" palette="WoodlandCamo">
+		<LayerProp filter="BooneyHatAndBluntMeleeWeapon" palette="WoodlandCamo">
 			<Surface name="RGM_BLUNT_BOONEY" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_BOONEY" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingHat" palette="WoodlandCamo">
+		<LayerProp filter="BooneyHat" palette="WoodlandCamo">
 			<Surface name="RGMRIFLE_IDLE_BOONEY" animsurface="RGMSTANDING" />
 			<Surface name="RGMBASICWALK_BOONEY" animsurface="RGMBASICWALKING" />
 			<Surface name="RGMRUNNING_BOONEY" animsurface="RGMRUNNING" />
@@ -4524,11 +4638,16 @@
 			<Surface name="WATER_DUAL_AIM_BOONEY" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_BOONEY" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="FurHatAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Ushanka" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Ushanka" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="FurHatAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Ushanka" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Ushanka" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Ushanka" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Ushanka" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Ushanka" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Ushanka" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Ushanka" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Ushanka" animsurface="RGMWATER_N_AIM" />
@@ -4660,11 +4779,16 @@
 			<Surface name="WATER_DUAL_AIM_Ushanka" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Ushanka" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="USOfficerHatAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_UScap" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_UScap" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="USOfficerHatAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_UScap" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_UScap" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_UScap" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_UScap" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_UScap" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_UScap" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_UScap" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_UScap" animsurface="RGMWATER_N_AIM" />
@@ -4796,11 +4920,16 @@
 			<Surface name="WATER_DUAL_AIM_UScap" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_UScap" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="USSROfficerHatAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_USSRcap" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_USSRcap" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="USSROfficerHatAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_USSRcap" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_USSRcap" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_USSRcap" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_USSRcap" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_USSRcap" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_USSRcap" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_USSRcap" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_USSRcap" animsurface="RGMWATER_N_AIM" />
@@ -4932,11 +5061,16 @@
 			<Surface name="WATER_DUAL_AIM_USSRcap" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_USSRcap" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="RussianCapAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_RUScap" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_RUScap" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="RussianCapAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_RUScap" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_RUScap" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_RUScap" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_RUScap" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_RUScap" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_RUScap" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_RUScap" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_RUScap" animsurface="RGMWATER_N_AIM" />
@@ -5068,11 +5202,16 @@
 			<Surface name="WATER_DUAL_AIM_RUScap" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_RUScap" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="BlackCapAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Blackcap" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Blackcap" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="BlackCapAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Blackcap" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Blackcap" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Blackcap" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Blackcap" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Blackcap" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Blackcap" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Blackcap" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Blackcap" animsurface="RGMWATER_N_AIM" />
@@ -5204,11 +5343,16 @@
 			<Surface name="WATER_DUAL_AIM_Blackcap" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Blackcap" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="CowboyHatAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Stetson" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Stetson" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="CowboyHatAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Stetson" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Stetson" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Stetson" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Stetson" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Stetson" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Stetson" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Stetson" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Stetson" animsurface="RGMWATER_N_AIM" />
@@ -5340,16 +5484,21 @@
 			<Surface name="WATER_DUAL_AIM_Stetson" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Stetson" animsurface="RGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBallcapAndHasPistol" >
+		<LayerProp filter="BallcapAndPistolLeft" >
+			<Surface name="RGMEMPTY_RUN_BCAP" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_BCAP" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="BallcapAndPistol" >
 			<Surface name="RGMPISTOL_WALK_BCAP" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_BCAP" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_BCAP" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_BCAP" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_BCAP" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_BCAP" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_BCAP" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_BCAP" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBallcapAndHasRifle" >
+		<LayerProp filter="BallcapAndRifle" >
 			<Surface name="RGM_RIFLE_OPEN_BCAP" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_BCAP" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_BCAP" animsurface="RGM_COWER_PRONE" />
@@ -5367,7 +5516,7 @@
 			<Surface name="RGM_BLUNT_BCAP" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_BCAP" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBallcap" >
+		<LayerProp filter="Ballcap" >
 			<Surface name="RGMRIFLE_IDLE_BCAP" animsurface="RGMSTANDING" />
 			<Surface name="RGMBASICWALK_BCAP" animsurface="RGMBASICWALKING" />
 			<Surface name="RGMRUNNING_BCAP" animsurface="RGMRUNNING" />
@@ -5478,16 +5627,21 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="facegear">
-		<LayerProp filter="IsWearingNVGandHasPistol" palette="hats">
+		<LayerProp filter="NVGAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_NVG" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_NVG" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="NVGAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_NVG" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_NVG" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_NVG" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_NVG" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_NVG" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_NVG" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_NVG" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_NVG" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingNVGandHasRifle" palette="hats">
+		<LayerProp filter="NVGAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_NVG" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_NVG" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_NVG" animsurface="RGM_COWER_PRONE" />
@@ -5505,7 +5659,7 @@
 			<Surface name="RGM_BLUNT_NVG" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_NVG" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingNVG" palette="hats">
+		<LayerProp filter="NVG" palette="hats">
 			<Surface name="RGMRIFLE_WALK_CROUCH_NVG" animsurface="RGMCROUCH_R_RDY" />
 			<Surface name="RGMRIFLE_WALK_NVG" animsurface="RGMWALK_R_RDY" />
 			<Surface name="RGMRIFLE_IDLE_NVG" animsurface="RGMSTANDING" />
@@ -5614,11 +5768,16 @@
 			<Surface name="WATER_DUAL_AIM_NVG" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_NVG" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="GogglesAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Goggles" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Goggles" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="GogglesAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Goggles" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Goggles" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Goggles" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Goggles" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Goggles" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Goggles" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Goggles" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Goggles" animsurface="RGMWATER_N_AIM" />
@@ -5752,16 +5911,21 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="gasmask">
-		<LayerProp filter="IsWearingGasmaskAndHasPistol" palette="hats">
+		<LayerProp filter="GasmaskAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_GMASK" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_GMASK" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="GasmaskAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_GMASK" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_GMASK" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_GMASK" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_GMASK" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_GMASK" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_GMASK" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_GMASK" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_GMASK" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGasmaskAndHasRifle" palette="hats">
+		<LayerProp filter="GasmaskAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_GMASK" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_GMASK" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_GMASK" animsurface="RGM_COWER_PRONE" />
@@ -5779,7 +5943,7 @@
 			<Surface name="RGM_BLUNT_GMASK" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_GMASK" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingGasmask" palette="hats">
+		<LayerProp filter="Gasmask" palette="hats">
 			<Surface name="RGMRIFLE_WALK_CROUCH_GMASK" animsurface="RGMCROUCH_R_RDY" />
 			<Surface name="RGMRIFLE_WALK_GMASK" animsurface="RGMWALK_R_RDY" />
 			<Surface name="RGMRIFLE_IDLE_GMASK" animsurface="RGMSTANDING" />
@@ -5890,11 +6054,16 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="ears">
+		<LayerProp filter="HeadSetAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Headset" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Headset" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="HeadSetAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Headset" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Headset" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Headset" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Headset" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Headset" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Headset" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Headset" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Headset" animsurface="RGMWATER_N_AIM" />
@@ -6028,13 +6197,16 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="vest">
+		<LayerProp filter="EODvestAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_eod_v" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_eod_v" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="EODvestAndPistol" palette="hats">
-			<Surface name="RGMPISTOL_IDLE_eod_v" animsurface="RGMPISTOLBREATH" />
 			<Surface name="RGMPISTOL_WALK_eod_v" animsurface="RGMNOTHING_WALK" />
-			<Surface name="RGMPISTOL_RDY_WALK_eod_v" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMEMPTY_RUN_eod_v" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_eod_v" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_eod_v" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_eod_v" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_eod_v" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_eod_v" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_eod_v" animsurface="RGMWATER_N_AIM" />
@@ -6095,6 +6267,8 @@
 			<Surface name="RGMEMPTY_PRONE_eod_v" animsurface="RGMHANDGUN_PRONE" />
 			<Surface name="RGMDUAL_PRONE_eod_v" animsurface="RGMDWPRONE" />
 			<Surface name="RGMDUAL_RDY_WALK_eod_v" animsurface="RGMWALK_D_RDY" />
+			<Surface name="RGMPISTOL_IDLE_eod_v" animsurface="RGMPISTOLBREATH" />
+			<Surface name="RGMPISTOL_RDY_WALK_eod_v" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMPISTOL_AIM_eod_v" animsurface="RGMHANDGUN_S_SHOT" />
 			<Surface name="RGMPISTOL_AIM_1H_eod_v" animsurface="RGM_PFSHOT_AIM" />
 			<Surface name="RGMPISTOL_LOW_eod_v" animsurface="RGMPISTOLSHOOTLOW" />
@@ -6165,18 +6339,21 @@
 			<Surface name="WATER_DUAL_AIM_eod_v" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_eod_v" animsurface="RGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingSpectraVestAndHasPistol" palette="hats">
-			<Surface name="RGMPISTOL_IDLE_spectra" animsurface="RGMPISTOLBREATH" />
+		<LayerProp filter="SpectraVestAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_spectra" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_spectra" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="SpectraVestAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_spectra" animsurface="RGMNOTHING_WALK" />
-			<Surface name="RGMPISTOL_RDY_WALK_spectra" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMEMPTY_RUN_spectra" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_spectra" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_spectra" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_spectra" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_spectra" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_spectra" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_spectra" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingSpectraVestAndHasRifle" palette="hats">
+		<LayerProp filter="SpectraVestAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_spectra" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_spectra" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_spectra" animsurface="RGM_COWER_PRONE" />
@@ -6232,6 +6409,8 @@
 			<Surface name="RGMEMPTY_PRONE_spectra" animsurface="RGMHANDGUN_PRONE" />
 			<Surface name="RGMDUAL_PRONE_spectra" animsurface="RGMDWPRONE" />
 			<Surface name="RGMDUAL_RDY_WALK_spectra" animsurface="RGMWALK_D_RDY" />
+			<Surface name="RGMPISTOL_IDLE_spectra" animsurface="RGMPISTOLBREATH" />
+			<Surface name="RGMPISTOL_RDY_WALK_spectra" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMPISTOL_AIM_spectra" animsurface="RGMHANDGUN_S_SHOT" />
 			<Surface name="RGMPISTOL_AIM_1H_spectra" animsurface="RGM_PFSHOT_AIM" />
 			<Surface name="RGMPISTOL_LOW_spectra" animsurface="RGMPISTOLSHOOTLOW" />
@@ -6302,18 +6481,21 @@
 			<Surface name="WATER_DUAL_AIM_spectra" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_spectra" animsurface="RGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingKevlarVestAndHasPistol" palette="hats">
-			<Surface name="RGMPISTOL_IDLE_kevlar" animsurface="RGMPISTOLBREATH" />
+		<LayerProp filter="KevlarVestAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_kevlar" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_kevlar" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="KevlarVestAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_kevlar" animsurface="RGMNOTHING_WALK" />
-			<Surface name="RGMPISTOL_RDY_WALK_kevlar" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMEMPTY_RUN_kevlar" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_kevlar" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_kevlar" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_kevlar" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_kevlar" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_kevlar" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_kevlar" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingKevlarVestAndHasRifle" palette="hats">
+		<LayerProp filter="KevlarVestAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_kevlar" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_kevlar" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_kevlar" animsurface="RGM_COWER_PRONE" />
@@ -6369,6 +6551,8 @@
 			<Surface name="RGMEMPTY_PRONE_kevlar" animsurface="RGMHANDGUN_PRONE" />
 			<Surface name="RGMDUAL_PRONE_kevlar" animsurface="RGMDWPRONE" />
 			<Surface name="RGMDUAL_RDY_WALK_kevlar" animsurface="RGMWALK_D_RDY" />
+			<Surface name="RGMPISTOL_IDLE_kevlar" animsurface="RGMPISTOLBREATH" />
+			<Surface name="RGMPISTOL_RDY_WALK_kevlar" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMPISTOL_AIM_kevlar" animsurface="RGMHANDGUN_S_SHOT" />
 			<Surface name="RGMPISTOL_AIM_1H_kevlar" animsurface="RGM_PFSHOT_AIM" />
 			<Surface name="RGMPISTOL_LOW_kevlar" animsurface="RGMPISTOLSHOOTLOW" />
@@ -6439,13 +6623,16 @@
 			<Surface name="WATER_DUAL_AIM_kevlar" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_kevlar" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="FlakVestAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Flakvest" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Flakvest" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="FlakVestAndPistol" palette="hats">
-			<Surface name="RGMPISTOL_IDLE_Flakvest" animsurface="RGMPISTOLBREATH" />
 			<Surface name="RGMPISTOL_WALK_Flakvest" animsurface="RGMNOTHING_WALK" />
-			<Surface name="RGMPISTOL_RDY_WALK_Flakvest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMEMPTY_RUN_Flakvest" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Flakvest" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Flakvest" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Flakvest" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Flakvest" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Flakvest" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Flakvest" animsurface="RGMWATER_N_AIM" />
@@ -6506,6 +6693,8 @@
 			<Surface name="RGMEMPTY_PRONE_Flakvest" animsurface="RGMHANDGUN_PRONE" />
 			<Surface name="RGMDUAL_PRONE_Flakvest" animsurface="RGMDWPRONE" />
 			<Surface name="RGMDUAL_RDY_WALK_Flakvest" animsurface="RGMWALK_D_RDY" />
+			<Surface name="RGMPISTOL_IDLE_Flakvest" animsurface="RGMPISTOLBREATH" />
+			<Surface name="RGMPISTOL_RDY_WALK_Flakvest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMPISTOL_AIM_Flakvest" animsurface="RGMHANDGUN_S_SHOT" />
 			<Surface name="RGMPISTOL_AIM_1H_Flakvest" animsurface="RGM_PFSHOT_AIM" />
 			<Surface name="RGMPISTOL_LOW_Flakvest" animsurface="RGMPISTOLSHOOTLOW" />
@@ -6576,13 +6765,16 @@
 			<Surface name="WATER_DUAL_AIM_Flakvest" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Flakvest" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="GuardianVestAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Guardvest" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Guardvest" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="GuardianVestAndPistol" palette="hats">
-			<Surface name="RGMPISTOL_IDLE_Guardvest" animsurface="RGMPISTOLBREATH" />
 			<Surface name="RGMPISTOL_WALK_Guardvest" animsurface="RGMNOTHING_WALK" />
-			<Surface name="RGMPISTOL_RDY_WALK_Guardvest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMEMPTY_RUN_Guardvest" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Guardvest" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Guardvest" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Guardvest" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Guardvest" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Guardvest" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Guardvest" animsurface="RGMWATER_N_AIM" />
@@ -6643,6 +6835,8 @@
 			<Surface name="RGMEMPTY_PRONE_Guardvest" animsurface="RGMHANDGUN_PRONE" />
 			<Surface name="RGMDUAL_PRONE_Guardvest" animsurface="RGMDWPRONE" />
 			<Surface name="RGMDUAL_RDY_WALK_Guardvest" animsurface="RGMWALK_D_RDY" />
+			<Surface name="RGMPISTOL_IDLE_Guardvest" animsurface="RGMPISTOLBREATH" />
+			<Surface name="RGMPISTOL_RDY_WALK_Guardvest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMPISTOL_AIM_Guardvest" animsurface="RGMHANDGUN_S_SHOT" />
 			<Surface name="RGMPISTOL_AIM_1H_Guardvest" animsurface="RGM_PFSHOT_AIM" />
 			<Surface name="RGMPISTOL_LOW_Guardvest" animsurface="RGMPISTOLSHOOTLOW" />
@@ -6713,13 +6907,16 @@
 			<Surface name="WATER_DUAL_AIM_Guardvest" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Guardvest" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="SWATVestAndPistolLeft" palette="swat_blue">
+			<Surface name="RGMEMPTY_RUN_SWATvest" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_SWATvest" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="SWATVestAndPistol" palette="swat_blue">
-			<Surface name="RGMPISTOL_IDLE_SWATvest" animsurface="RGMPISTOLBREATH" />
 			<Surface name="RGMPISTOL_WALK_SWATvest" animsurface="RGMNOTHING_WALK" />
-			<Surface name="RGMPISTOL_RDY_WALK_SWATvest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMEMPTY_RUN_SWATvest" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_SWATvest" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_SWATvest" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_SWATvest" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_SWATvest" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_SWATvest" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_SWATvest" animsurface="RGMWATER_N_AIM" />
@@ -6780,6 +6977,8 @@
 			<Surface name="RGMEMPTY_PRONE_SWATvest" animsurface="RGMHANDGUN_PRONE" />
 			<Surface name="RGMDUAL_PRONE_SWATvest" animsurface="RGMDWPRONE" />
 			<Surface name="RGMDUAL_RDY_WALK_SWATvest" animsurface="RGMWALK_D_RDY" />
+			<Surface name="RGMPISTOL_IDLE_SWATvest" animsurface="RGMPISTOLBREATH" />
+			<Surface name="RGMPISTOL_RDY_WALK_SWATvest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMPISTOL_AIM_SWATvest" animsurface="RGMHANDGUN_S_SHOT" />
 			<Surface name="RGMPISTOL_AIM_1H_SWATvest" animsurface="RGM_PFSHOT_AIM" />
 			<Surface name="RGMPISTOL_LOW_SWATvest" animsurface="RGMPISTOLSHOOTLOW" />
@@ -6850,13 +7049,16 @@
 			<Surface name="WATER_DUAL_AIM_SWATvest" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_SWATvest" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="ZylonVestAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Zylonvest" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Zylonvest" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="ZylonVestAndPistol" palette="hats">
-			<Surface name="RGMPISTOL_IDLE_Zylonvest" animsurface="RGMPISTOLBREATH" />
 			<Surface name="RGMPISTOL_WALK_Zylonvest" animsurface="RGMNOTHING_WALK" />
-			<Surface name="RGMPISTOL_RDY_WALK_Zylonvest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMEMPTY_RUN_Zylonvest" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Zylonvest" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Zylonvest" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Zylonvest" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Zylonvest" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Zylonvest" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Zylonvest" animsurface="RGMWATER_N_AIM" />
@@ -6917,6 +7119,8 @@
 			<Surface name="RGMEMPTY_PRONE_Zylonvest" animsurface="RGMHANDGUN_PRONE" />
 			<Surface name="RGMDUAL_PRONE_Zylonvest" animsurface="RGMDWPRONE" />
 			<Surface name="RGMDUAL_RDY_WALK_Zylonvest" animsurface="RGMWALK_D_RDY" />
+			<Surface name="RGMPISTOL_IDLE_Zylonvest" animsurface="RGMPISTOLBREATH" />
+			<Surface name="RGMPISTOL_RDY_WALK_Zylonvest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMPISTOL_AIM_Zylonvest" animsurface="RGMHANDGUN_S_SHOT" />
 			<Surface name="RGMPISTOL_AIM_1H_Zylonvest" animsurface="RGM_PFSHOT_AIM" />
 			<Surface name="RGMPISTOL_LOW_Zylonvest" animsurface="RGMPISTOLSHOOTLOW" />
@@ -6987,13 +7191,16 @@
 			<Surface name="WATER_DUAL_AIM_Zylonvest" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Zylonvest" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="TwaronVestAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Twavest" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Twavest" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="TwaronVestAndPistol" palette="hats">
-			<Surface name="RGMPISTOL_IDLE_Twavest" animsurface="RGMPISTOLBREATH" />
 			<Surface name="RGMPISTOL_WALK_Twavest" animsurface="RGMNOTHING_WALK" />
-			<Surface name="RGMPISTOL_RDY_WALK_Twavest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMEMPTY_RUN_Twavest" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Twavest" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Twavest" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Twavest" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Twavest" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Twavest" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Twavest" animsurface="RGMWATER_N_AIM" />
@@ -7054,6 +7261,8 @@
 			<Surface name="RGMEMPTY_PRONE_Twavest" animsurface="RGMHANDGUN_PRONE" />
 			<Surface name="RGMDUAL_PRONE_Twavest" animsurface="RGMDWPRONE" />
 			<Surface name="RGMDUAL_RDY_WALK_Twavest" animsurface="RGMWALK_D_RDY" />
+			<Surface name="RGMPISTOL_IDLE_Twavest" animsurface="RGMPISTOLBREATH" />
+			<Surface name="RGMPISTOL_RDY_WALK_Twavest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMPISTOL_AIM_Twavest" animsurface="RGMHANDGUN_S_SHOT" />
 			<Surface name="RGMPISTOL_AIM_1H_Twavest" animsurface="RGM_PFSHOT_AIM" />
 			<Surface name="RGMPISTOL_LOW_Twavest" animsurface="RGMPISTOLSHOOTLOW" />
@@ -7124,13 +7333,16 @@
 			<Surface name="WATER_DUAL_AIM_Twavest" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Twavest" animsurface="RGMMORTAR" />
 		</LayerProp>
+		<LayerProp filter="DyneemaVestAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Dynvest" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Dynvest" animsurface="RGMSIDESTEP" />
+		</LayerProp>
 		<LayerProp filter="DyneemaVestAndPistol" palette="hats">
-			<Surface name="RGMPISTOL_IDLE_Dynvest" animsurface="RGMPISTOLBREATH" />
 			<Surface name="RGMPISTOL_WALK_Dynvest" animsurface="RGMNOTHING_WALK" />
-			<Surface name="RGMPISTOL_RDY_WALK_Dynvest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMEMPTY_RUN_Dynvest" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Dynvest" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Dynvest" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Dynvest" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Dynvest" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Dynvest" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Dynvest" animsurface="RGMWATER_N_AIM" />
@@ -7191,6 +7403,8 @@
 			<Surface name="RGMEMPTY_PRONE_Dynvest" animsurface="RGMHANDGUN_PRONE" />
 			<Surface name="RGMDUAL_PRONE_Dynvest" animsurface="RGMDWPRONE" />
 			<Surface name="RGMDUAL_RDY_WALK_Dynvest" animsurface="RGMWALK_D_RDY" />
+			<Surface name="RGMPISTOL_IDLE_Dynvest" animsurface="RGMPISTOLBREATH" />
+			<Surface name="RGMPISTOL_RDY_WALK_Dynvest" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMPISTOL_AIM_Dynvest" animsurface="RGMHANDGUN_S_SHOT" />
 			<Surface name="RGMPISTOL_AIM_1H_Dynvest" animsurface="RGM_PFSHOT_AIM" />
 			<Surface name="RGMPISTOL_LOW_Dynvest" animsurface="RGMPISTOLSHOOTLOW" />
@@ -7261,18 +7475,21 @@
 			<Surface name="WATER_DUAL_AIM_Dynvest" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Dynvest" animsurface="RGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingFlakJacketAndHasPistol" palette="hats">
-			<Surface name="RGMPISTOL_IDLE_VEST" animsurface="RGMPISTOLBREATH" />
+		<LayerProp filter="ChestRigAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_VEST" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_VEST" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="ChestRigAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_VEST" animsurface="RGMNOTHING_WALK" />
-			<Surface name="RGMPISTOL_RDY_WALK_VEST" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMEMPTY_RUN_VEST" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_VEST" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_VEST" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_VEST" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_VEST" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_VEST" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_VEST" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingFlakJacketAndHasRifle" palette="hats">
+		<LayerProp filter="ChestRigAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_VEST" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_VEST" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_VEST" animsurface="RGM_COWER_PRONE" />
@@ -7286,11 +7503,11 @@
 			<Surface name="RGMRIFLE_SIDESTEP_AIM_VEST" animsurface="RGMSIDESTEP_R_RDY" />
 			<Surface name="RGMRIFLE_ROLL_SIDE_VEST" animsurface="RGMROLL_PR" />
 		</LayerProp>
-		<LayerProp filter="FlakJacketAndBluntMeleeWeapon" palette="hats">
+		<LayerProp filter="ChestRigAndBluntMeleeWeapon" palette="hats">
 			<Surface name="RGM_BLUNT_VEST" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_VEST" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="FlakJacket" palette="hats">
+		<LayerProp filter="ChestRig" palette="hats">
 			<Surface name="RGMRIFLE_WALK_CROUCH_VEST" animsurface="RGMCROUCH_R_RDY" />
 			<Surface name="RGMRIFLE_WALK_VEST" animsurface="RGMWALK_R_RDY" />
 			<Surface name="RGMRIFLE_IDLE_VEST" animsurface="RGMSTANDING" />
@@ -7328,6 +7545,8 @@
 			<Surface name="RGMEMPTY_PRONE_VEST" animsurface="RGMHANDGUN_PRONE" />
 			<Surface name="RGMDUAL_PRONE_VEST" animsurface="RGMDWPRONE" />
 			<Surface name="RGMDUAL_RDY_WALK_VEST" animsurface="RGMWALK_D_RDY" />
+			<Surface name="RGMPISTOL_IDLE_VEST" animsurface="RGMPISTOLBREATH" />
+			<Surface name="RGMPISTOL_RDY_WALK_VEST" animsurface="RGMWALK_P_RDY" />
 			<Surface name="RGMPISTOL_AIM_VEST" animsurface="RGMHANDGUN_S_SHOT" />
 			<Surface name="RGMPISTOL_AIM_1H_VEST" animsurface="RGM_PFSHOT_AIM" />
 			<Surface name="RGMPISTOL_LOW_VEST" animsurface="RGMPISTOLSHOOTLOW" />
@@ -7401,16 +7620,21 @@
 	</Layer>
 	<Layer name="backpack">
 <!--
-		<LayerProp filter="IsWearingBigRadioSetAndHasPistol" palette="hats">
+		<LayerProp filter="BigRadioSetAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Bigradio" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Bigradio" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="BigRadioSetAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Bigradio" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Bigradio" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Bigradio" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Bigradio" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Bigradio" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Bigradio" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Bigradio" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Bigradio" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBigRadioSetAndHasRifle" palette="hats">
+		<LayerProp filter="BigRadioSetAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_Bigradio" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_Bigradio" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_Bigradio" animsurface="RGM_COWER_PRONE" />
@@ -7428,7 +7652,7 @@
 			<Surface name="RGM_BLUNT_Bigradio" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_Bigradio" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBigRadioSet" palette="hats">
+		<LayerProp filter="BigRadioSet" palette="hats">
 			<Surface name="RGMRIFLE_WALK_CROUCH_Bigradio" animsurface="RGMCROUCH_R_RDY" />
 			<Surface name="RGM_CROUCHWALK_Bigradio" animsurface="RGMCROUCH_P_RDY" />
 			<Surface name="RGM_CROUCHWALK_DUAL_Bigradio" animsurface="RGMCROUCH_D_RDY" />
@@ -7536,16 +7760,21 @@
 			<Surface name="CROUCH_MORTAR_Bigradio" animsurface="RGMMORTAR" />
 		</LayerProp>
 -->
-		<LayerProp filter="IsWearingMedRadioSetAndHasPistol" palette="hats">
+		<LayerProp filter="MedRadioSetAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_Medradio" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_Medradio" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="MedRadioSetAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_Medradio" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_Medradio" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_Medradio" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_Medradio" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_Medradio" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_Medradio" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_Medradio" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_Medradio" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingMedRadioSetAndHasRifle" palette="hats">
+		<LayerProp filter="MedRadioSetAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_Medradio" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_Medradio" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_Medradio" animsurface="RGM_COWER_PRONE" />
@@ -7563,7 +7792,7 @@
 			<Surface name="RGM_BLUNT_Medradio" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_Medradio" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingMedRadioSet" palette="hats">
+		<LayerProp filter="MedRadioSet" palette="hats">
 			<Surface name="RGMRIFLE_WALK_CROUCH_Medradio" animsurface="RGMCROUCH_R_RDY" />
 			<Surface name="RGM_CROUCHWALK_Medradio" animsurface="RGMCROUCH_P_RDY" />
 			<Surface name="RGM_CROUCHWALK_DUAL_Medradio" animsurface="RGMCROUCH_D_RDY" />
@@ -7670,16 +7899,21 @@
 			<Surface name="WATER_DUAL_AIM_Medradio" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_Medradio" animsurface="RGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCombatPackAndHasPistol" palette="hats">
+		<LayerProp filter="CombatPackAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_CP" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_CP" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="CombatPackAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_CP" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_CP" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_CP" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_CP" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_CP" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_CP" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_CP" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_CP" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCombatPackAndHasRifle" palette="hats">
+		<LayerProp filter="CombatPackAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_CP" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_CP" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_CP" animsurface="RGM_COWER_PRONE" />
@@ -7697,7 +7931,7 @@
 			<Surface name="RGM_BLUNT_CP" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_CP" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingCombatPack" palette="hats">
+		<LayerProp filter="CombatPack" palette="hats">
 			<Surface name="RGMRIFLE_WALK_CROUCH_CP" animsurface="RGMCROUCH_R_RDY" />
 			<Surface name="RGM_CROUCHWALK_CP" animsurface="RGMCROUCH_P_RDY" />
 			<Surface name="RGM_CROUCHWALK_DUAL_CP" animsurface="RGMCROUCH_D_RDY" />
@@ -7804,16 +8038,21 @@
 			<Surface name="WATER_DUAL_AIM_CP" animsurface="RGMWATER_DBLSHT" />
 			<Surface name="CROUCH_MORTAR_CP" animsurface="RGMMORTAR" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBackpackAndHasPistol" palette="hats">
+		<LayerProp filter="BackpackAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_BP" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_BP" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="BackpackAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_BP" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_BP" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_BP" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_BP" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_BP" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_BP" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_BP" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_BP" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBackpackAndHasRifle" palette="hats">
+		<LayerProp filter="BackpackAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_BP" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_BP" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_BP" animsurface="RGM_COWER_PRONE" />
@@ -7831,7 +8070,7 @@
 			<Surface name="RGM_BLUNT_BP" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_BP" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="IsWearingBackpack" palette="hats">
+		<LayerProp filter="Backpack" palette="hats">
 			<Surface name="RGMRIFLE_WALK_CROUCH_BP" animsurface="RGMCROUCH_R_RDY" />
 			<Surface name="RGM_CROUCHWALK_BP" animsurface="RGMCROUCH_P_RDY" />
 			<Surface name="RGM_CROUCHWALK_DUAL_BP" animsurface="RGMCROUCH_D_RDY" />
@@ -7940,16 +8179,21 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="legrig">
-		<LayerProp filter="HasHolsterAndPistol" palette="hats">
+		<LayerProp filter="HolsterAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_holster" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_holster" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="HolsterAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_holster" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_holster" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_holster" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_holster" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_holster" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_holster" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_holster" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_holster" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="HasHolsterAndRifle" palette="hats">
+		<LayerProp filter="HolsterAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_holster" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_holster" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_holster" animsurface="RGM_COWER_PRONE" />
@@ -8075,16 +8319,21 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="legrig_left">
-		<LayerProp filter="HasLeftHolsterAndPistol" palette="hats">
+		<LayerProp filter="LeftHolsterAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_holster_l" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_holster_l" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="LeftHolsterAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_holster_l" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_holster_l" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_holster_l" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_holster_l" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_holster_l" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_holster_l" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_holster_l" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_holster_l" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="HasLeftHolsterAndRifle" palette="hats">
+		<LayerProp filter="LeftHolsterAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_holster_l" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_holster_l" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_holster_l" animsurface="RGM_COWER_PRONE" />
@@ -8102,7 +8351,7 @@
 			<Surface name="RGM_BLUNT_holster_l" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_holster_l" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="HolsterLeft" palette="hats">
+		<LayerProp filter="LeftHolster" palette="hats">
 			<Surface name="RGMRIFLE_WALK_CROUCH_holster_l" animsurface="RGMCROUCH_R_RDY" />
 			<Surface name="RGM_CROUCHWALK_holster_l" animsurface="RGMCROUCH_P_RDY" />
 			<Surface name="RGM_CROUCHWALK_DUAL_holster_l" animsurface="RGMCROUCH_D_RDY" />
@@ -8210,16 +8459,21 @@
 		</LayerProp>
 	</Layer>
 	<Layer name="knees">
-		<LayerProp filter="HasKneepadsAndHasPistol" palette="hats">
+		<LayerProp filter="KneepadsAndPistolLeft" palette="hats">
+			<Surface name="RGMEMPTY_RUN_PADS" animsurface="RGMPISTOL_RUN" />			
+			<Surface name="RGMDUAL_SDSTP_PADS" animsurface="RGMSIDESTEP" />
+		</LayerProp>
+		<LayerProp filter="KneepadsAndPistol" palette="hats">
 			<Surface name="RGMPISTOL_WALK_PADS" animsurface="RGMNOTHING_WALK" />
 			<Surface name="RGMEMPTY_RUN_PADS" animsurface="RGMPISTOL_RUN" />			
 			<Surface name="RGMEMPTY_RUN_PADS" animsurface="RGMNOTHING_RUN" />
 			<Surface name="RGMPISTOL_SDSTP_PADS" animsurface="RGMSIDESTEP" />
+			<Surface name="RGMEMPTY_DRUNK_PADS" animsurface="RGMPISTOLDRUNK" />
 			<Surface name="WATER_PISTOL_IDLE_PADS" animsurface="RGMWATER_N_STD" />
 			<Surface name="WATER_PISTOL_WALK_PADS" animsurface="RGMWATER_N_WALK" />
 			<Surface name="WATER_PISTOL_AIM_PADS" animsurface="RGMWATER_N_AIM" />
 		</LayerProp>
-		<LayerProp filter="HasKneepadsAndHasRifle" palette="hats">
+		<LayerProp filter="KneepadsAndRifle" palette="hats">
 			<Surface name="RGM_RIFLE_OPEN_PADS" animsurface="RGMOPEN" />
 			<Surface name="RGMRIFLE_COWER_PADS" animsurface="RGMCOWER" />
 			<Surface name="RGMRIFLE_PRN_COWER_PADS" animsurface="RGM_COWER_PRONE" />
@@ -8237,7 +8491,7 @@
 			<Surface name="RGM_BLUNT_PADS" animsurface="RGMPUNCH" />
 			<Surface name="RGMCROWBAR_CR_HIT_PADS" animsurface="RGMPUNCHLOW" />
 		</LayerProp>
-		<LayerProp filter="HasKneepads" palette="hats">
+		<LayerProp filter="Kneepads" palette="hats">
 			<Surface name="RGMRIFLE_WALK_CROUCH_PADS" animsurface="RGMCROUCH_R_RDY" />
 			<Surface name="RGM_CROUCHWALK_PADS" animsurface="RGMCROUCH_P_RDY" />
 			<Surface name="RGM_CROUCHWALK_DUAL_PADS" animsurface="RGMCROUCH_D_RDY" />