diff --git a/Ereshkigal-BaseAssortGenerator/config/custom_presets.json b/Ereshkigal-BaseAssortGenerator/config/custom_presets.json
index 49a4682..14b9855 100644
--- a/Ereshkigal-BaseAssortGenerator/config/custom_presets.json
+++ b/Ereshkigal-BaseAssortGenerator/config/custom_presets.json
@@ -509,5 +509,169 @@
 				}
 			}
 		]
+	},
+	"sa58_mech_trade_L3": {
+		"_id": "sa58_mech_trade_L3",
+		"_type": "Preset",
+		"_changeWeaponName": false,
+		"_name": "sa 58 mech trade l3",
+		"_parent": "610418efc8c74e1c6118b50c",
+		"_items": [
+			{
+				"_id": "610418efc8c74e1c6118b50c",
+                "_tpl": "5b0bbe4e5acfc40dc528a72d",
+				"upd": {
+					"StackObjectsCount": 200,
+					"Repairable": {
+						"MaxDurability": 100,
+						"Durability": 100
+					},
+					"FireMode": {
+						"FireMode": "single"
+					}
+				}
+			},
+			{
+                "_id": "610418efc8c74e1c6118b50d",
+                "_tpl": "5b099b965acfc400186331e6",
+                "parentId": "610418efc8c74e1c6118b50c",
+                "slotId": "mod_pistol_grip",
+                "location": null
+            }, {
+                "_id": "610418efc8c74e1c6118b50e",
+                "_tpl": "5b7c2d1d5acfc43d1028532a",
+                "parentId": "610418efc8c74e1c6118b50c",
+                "slotId": "mod_magazine",
+                "location": null
+            }, {
+                "_id": "610418efc8c74e1c6118b50f",
+                "_tpl": "5b7bedd75acfc43d825283f9",
+                "parentId": "610418efc8c74e1c6118b50c",
+                "slotId": "mod_handguard",
+                "location": null
+            }, {
+                "_id": "610418efc8c74e1c6118b510",
+                "_tpl": "5b7be46e5acfc400170e2dcf",
+                "parentId": "610418efc8c74e1c6118b50f",
+                "slotId": "mod_mount_000",
+                "location": null
+            }, {
+                "_id": "610418efc8c74e1c6118b511",
+                "_tpl": "5b7be1265acfc400161d0798",
+                "parentId": "610418efc8c74e1c6118b50c",
+                "slotId": "mod_barrel",
+                "location": null
+            }, {
+                "_id": "610418efc8c74e1c6118b512",
+                "_tpl": "5b099b7d5acfc400186331e4",
+                "parentId": "610418efc8c74e1c6118b511",
+                "slotId": "mod_muzzle",
+                "location": null
+            }, {
+                "_id": "610418efc8c74e1c6118b513",
+                "_tpl": "5b0bc22d5acfc47a8607f085",
+                "parentId": "610418efc8c74e1c6118b50c",
+                "slotId": "mod_sight_rear",
+                "location": null
+            }, {
+                "_id": "610418efc8c74e1c6118b514",
+                "_tpl": "5b099bb25acfc400186331e8",
+                "parentId": "610418efc8c74e1c6118b50c",
+                "slotId": "mod_reciever",
+                "location": null
+            }, {
+                "_id": "610418efc8c74e1c6118b515",
+                "_tpl": "5b7d63de5acfc400170e2f8d",
+                "parentId": "610418efc8c74e1c6118b50c",
+                "slotId": "mod_stock",
+                "location": null
+            }
+		]
+	},
+	"sa58_drum_mech_trade_L3": {
+		"_id": "sa58_drum_mech_trade_L3",
+		"_type": "Preset",
+		"_changeWeaponName": false,
+		"_name": "sa 58 mech trade l3",
+		"_parent": "610418ecc8c74e1c6118b180",
+		"_items": [
+			{
+				"_id": "610418ecc8c74e1c6118b180",
+                "_tpl": "5b0bbe4e5acfc40dc528a72d",
+				"upd": {
+					"StackObjectsCount": 200,
+					"Repairable": {
+						"MaxDurability": 100,
+						"Durability": 100
+					},
+					"FireMode": {
+						"FireMode": "single"
+					}
+				}
+			}, {
+                "_id": "610418ecc8c74e1c6118b181",
+                "_tpl": "5b7d679f5acfc4001a5c4024",
+                "parentId": "610418ecc8c74e1c6118b180",
+                "slotId": "mod_pistol_grip",
+                "location": null
+            }, {
+                "_id": "610418ecc8c74e1c6118b182",
+                "_tpl": "5b7bef9c5acfc43d102852ec",
+                "parentId": "610418ecc8c74e1c6118b180",
+                "slotId": "mod_magazine",
+                "location": null
+            }, {
+                "_id": "610418ecc8c74e1c6118b183",
+                "_tpl": "5b7bee755acfc400196d5383",
+                "parentId": "610418ecc8c74e1c6118b180",
+                "slotId": "mod_handguard",
+                "location": null
+            }, {
+                "_id": "610418ecc8c74e1c6118b184",
+                "_tpl": "5b7be46e5acfc400170e2dcf",
+                "parentId": "610418ecc8c74e1c6118b183",
+                "slotId": "mod_mount_000"
+            }, {
+                "_id": "610418ecc8c74e1c6118b185",
+                "_tpl": "59fc48e086f77463b1118392",
+                "parentId": "610418ecc8c74e1c6118b184",
+                "slotId": "mod_foregrip"
+            }, {
+                "_id": "610418ecc8c74e1c6118b186",
+                "_tpl": "5b7be4645acfc400170e2dcc",
+                "parentId": "610418ecc8c74e1c6118b183",
+                "slotId": "mod_mount_001"
+            }, {
+                "_id": "610418ecc8c74e1c6118b187",
+                "_tpl": "5b7be4645acfc400170e2dcc",
+                "parentId": "610418ecc8c74e1c6118b183",
+                "slotId": "mod_mount_002"
+            }, {
+                "_id": "610418ecc8c74e1c6118b188",
+                "_tpl": "5b099a765acfc47a8607efe3",
+                "parentId": "610418ecc8c74e1c6118b180",
+                "slotId": "mod_barrel"
+            }, {
+                "_id": "610418ecc8c74e1c6118b189",
+                "_tpl": "5b7d693d5acfc43bca706a3d",
+                "parentId": "610418ecc8c74e1c6118b188",
+                "slotId": "mod_muzzle"
+            }, {
+                "_id": "610418ecc8c74e1c6118b18a",
+                "_tpl": "5b0bc22d5acfc47a8607f085",
+                "parentId": "610418ecc8c74e1c6118b180",
+                "slotId": "mod_sight_rear"
+            }, {
+                "_id": "610418ecc8c74e1c6118b18b",
+                "_tpl": "5b099bb25acfc400186331e8",
+                "parentId": "610418ecc8c74e1c6118b180",
+                "slotId": "mod_reciever"
+            }, {
+                "_id": "610418ecc8c74e1c6118b18c",
+                "_tpl": "5b7d64555acfc4001876c8e2",
+                "parentId": "610418ecc8c74e1c6118b180",
+                "slotId": "mod_stock"
+            }
+		]
 	}
 }
\ No newline at end of file
diff --git a/Ereshkigal-BaseAssortGenerator/src/mechanic.js b/Ereshkigal-BaseAssortGenerator/src/mechanic.js
index 08fa0d5..e13ac50 100644
--- a/Ereshkigal-BaseAssortGenerator/src/mechanic.js
+++ b/Ereshkigal-BaseAssortGenerator/src/mechanic.js
@@ -1521,13 +1521,22 @@ class MechanicAssort{
         CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5b439b1f86f7744fd8059cbe", "5a7c2eca46aef81a7ca2145d", 36998, "RUB", 3, false, 2000);
 
         //ds arms sa-58
-        CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5b439b5686f77428bd137424", "hideout", "hideout", [
+        CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "sa58_mech_trade_L3", "hideout", "hideout", [
                 [{
                         "count": 12,
                         "_tpl": "5d1c819a86f774771b0acd6c"
                     }
                 ]
             ], "5a7c2eca46aef81a7ca2145d", 3, false, 200);
+			
+		//ds arms sa-58
+        CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "sa58_drum_mech_trade_L3", "hideout", "hideout", [
+                [{
+                        "count": 8,
+                        "_tpl": "5d1c819a86f774771b0acd6c"
+                    }
+                ]
+            ], "5a7c2eca46aef81a7ca2145d", 3, false, 200);
 
         //lone star tx-15 dml 5.56 carbine d-warrior
         CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5dd8013ff4c3af18c507b10a", "hideout", "hideout", [
@@ -1541,15 +1550,6 @@ class MechanicAssort{
                 ]
             ], "5a7c2eca46aef81a7ca2145d", 3, false, 2000, 1);
 
-        //ds arms sa-58
-        CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5b439b5686f77428bd137424", "hideout", "hideout", [
-                [{
-                        "count": 12,
-                        "_tpl": "5d1c819a86f774771b0acd6c"
-                    }
-                ]
-            ], "5a7c2eca46aef81a7ca2145d", 3, false, 200);
-
         //rpk-16 5.45x39 light machine gun
         CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5c0d1ec986f77439512a1a72", "hideout", "hideout", [
                 [{
diff --git a/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js b/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js
index 53b395c..d1d8e15 100644
--- a/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js
+++ b/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js
@@ -231,16 +231,16 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5c0d4e61d09282029f53920e"); // the guide
 
         //M80
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "58dd3ad986f77403051cba8f", "5935c25fb3acc3127c3d8cd9", 3, "USD", 2, false, 500000, 200);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "58dd3ad986f77403051cba8f", "5935c25fb3acc3127c3d8cd9", 2, "USD", 2, false, 500000, 200);
 
         //MK 255 Mod 0 (RRLP)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e6918f86f7746c9f75e849", "5935c25fb3acc3127c3d8cd9", 2, "USD", 2, true, 999999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e6918f86f7746c9f75e849", "5935c25fb3acc3127c3d8cd9", 1, "USD", 2, true, 999999);
 
         //SS197SR
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc80f8fe4a949033b0224a2", "5935c25fb3acc3127c3d8cd9", 2, "USD", 2, false, 200000, 300);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc80f8fe4a949033b0224a2", "5935c25fb3acc3127c3d8cd9", 1, "USD", 2, false, 200000, 300);
 
         //.45 ACP Lasermatch FMJ
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5efb0d4f4bc50b58e81710f3", "5935c25fb3acc3127c3d8cd9", 2, "USD", 2, false, 600000, 300);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5efb0d4f4bc50b58e81710f3", "5935c25fb3acc3127c3d8cd9", 1, "USD", 2, false, 600000, 300);
 
         //9x19 Quakemaker
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5efb0e16aeb21837e749c7ff", "5935c25fb3acc3127c3d8cd9", 2, "USD", 2, false, 500000, 200);
diff --git a/Ereshkigal-BaseAssortGenerator/src/ragman.js b/Ereshkigal-BaseAssortGenerator/src/ragman.js
index 9b45305..a36e304 100644
--- a/Ereshkigal-BaseAssortGenerator/src/ragman.js
+++ b/Ereshkigal-BaseAssortGenerator/src/ragman.js
@@ -327,14 +327,6 @@ class RagmanAssort
             "_tpl": "59f32c3b86f77472a31742f0"
         }
         ]], "5ac3b934156ae10c4430e83c", 2, false, 20000, 5);
-		
-		
-		// UNTAR helmet
-		CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7d03ae5b5b00016327db5", "hideout", "hideout", [[{
-            "count": 2,
-            "_tpl": "59e770b986f7742cbd762754"
-        }
-        ]], "5ac3b934156ae10c4430e83c", 2, false, 2000, 3);
     }
     static GenerateLL3()
     {