diff --git a/1.6/Defs/PawnKindDefs/PawnKindDefs_Power_Armor_Trader.xml b/1.6/Defs/PawnKindDefs/PawnKindDefs_Power_Armor_Trader.xml
index 25bdbbe..44bf61f 100644
--- a/1.6/Defs/PawnKindDefs/PawnKindDefs_Power_Armor_Trader.xml
+++ b/1.6/Defs/PawnKindDefs/PawnKindDefs_Power_Armor_Trader.xml
@@ -38,7 +38,7 @@
         <weaponTags>
             <li>IndustrialGunAdvanced</li>
         </weaponTags>
-        <weaponMoney>300~600</weaponMoney>
+        <weaponMoney>400~600</weaponMoney>
         <techHediffsMoney>500~1200</techHediffsMoney>
         <techHediffsChance>0.25</techHediffsChance>
         <forcedTraits>
diff --git a/1.6/Defs/TraderKindDefs/TraderKindDefs_Power_Armor.xml b/1.6/Defs/TraderKindDefs/TraderKindDefs_Power_Armor.xml
index 0dc619a..7a515cc 100644
--- a/1.6/Defs/TraderKindDefs/TraderKindDefs_Power_Armor.xml
+++ b/1.6/Defs/TraderKindDefs/TraderKindDefs_Power_Armor.xml
@@ -76,23 +76,12 @@
             </li>
 
         </stockGenerators>
-        <buyFilters>
-            <thingFilter>
-                <thingDefs>
-                    <!-- Power Armor Frames and Armor -->
-                    <li>FCP_Apparel_Power_Armor_Frame</li>
-                    <li>FCP_Apparel_Power_Armor_T45Armor</li>
-                    <li>FCP_Apparel_Power_Armor_T51Armor</li>
-                    <li>FCP_Apparel_Power_Armor_T60Armor</li>
-                    <li>FCP_Apparel_X01_Power_Armor</li>
-                    <!-- Power Armor Helmets -->
-                    <li>FCP_Apparel_Power_Armor_T45_Helmet</li>
-                    <li>FCP_Apparel_Power_Armor_T51_Helmet</li>
-                    <li>FCP_Apparel_Power_Armor_T60_Helmet</li>
-                    <li>FCP_Apparel_Power_Armor_X01_Helmet</li>
-                </thingDefs>
-            </thingFilter>
-        </buyFilters>
+        <stockGenerators>
+            <!-- Buying - Power Armor Items -->
+            <li Class="StockGenerator_BuyTradeTag">
+                <tag>FCP_PowerArmor</tag>
+            </li>
+        </stockGenerators>
     </TraderKindDef>
 
 </Defs>