diff --git a/Ereshkigal-BaseAssortGenerator/src/jeager.js b/Ereshkigal-BaseAssortGenerator/src/jeager.js
index 4de22f7..07b83f0 100644
--- a/Ereshkigal-BaseAssortGenerator/src/jeager.js
+++ b/Ereshkigal-BaseAssortGenerator/src/jeager.js
@@ -18,7 +18,7 @@ class JeagerAssort
 
 		// Aim sports mng rail for mosin rifle
 		id = HashUtil.generate();
-		CoreMod.CreateTraderAssort(id, "5bc5a372d4351e44f824d17f", "5c0647fdd443bc2504c2d371", 500, "RUB", 1, true, 2000, 5);
+		CoreMod.CreateTraderAssort(id, "5bc5a372d4351e44f824d17f", "5c0647fdd443bc2504c2d371", 1902, "RUB", 1, true, 999999, 5);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5bc479e586f7747f376c7da3"); // The Tarkov shooter - Part 2
 
         //12/70 7mm buckshot
@@ -194,10 +194,10 @@ class JeagerAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d024f5cd7ad1a04a067e91a", "5c0647fdd443bc2504c2d371", 2573, "RUB", 1, false, 2000, 3);
 
         //vpo-215 scope rail mount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5de6558e9f98ac2bc65950fc", "5c0647fdd443bc2504c2d371", 11575, "RUB", 1, false, 2000, 3);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5de6558e9f98ac2bc65950fc", "5c0647fdd443bc2504c2d371", 1575, "RUB", 1, false, 2000, 3);
 
         //etmi-019 shotgun rail mount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfe14f30b92095fd441edaf", "5c0647fdd443bc2504c2d371", 2100, "RUB", 1, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfe14f30b92095fd441edaf", "5c0647fdd443bc2504c2d371", 2100, "RUB", 1, false, 2000, 5);
 
         //utg 25mm ring mount
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5dff77c759400025ea5150cf", "5c0647fdd443bc2504c2d371", 1733, "RUB", 1, false, 20000, 5);
@@ -227,7 +227,7 @@ class JeagerAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfd384c0db834001a6691d3", "5c0647fdd443bc2504c2d371", 3486, "RUB", 1, false, 2000);
 
         //mp-133 12ga 660mm barrel
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "560836fb4bdc2d773f8b4569", "5c0647fdd443bc2504c2d371", 5256, "RUB", 1, false, 1000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "560836fb4bdc2d773f8b4569", "5c0647fdd443bc2504c2d371", 5256, "RUB", 1, false, 10000);
 
         //mp-133 12ga 660mm barrel with rib
         CoreMod.CreateTraderAssort(HashUtil.generate(), "560837154bdc2da74d8b4568", "5c0647fdd443bc2504c2d371", 5777, "RUB", 1, false, 10000);
@@ -286,7 +286,7 @@ class JeagerAssort
             "count": 3,
             "_tpl": "590c621186f774138d11ea29"
         }
-        ]], "5c0647fdd443bc2504c2d371", 1, false, 500, 1);
+        ]], "5c0647fdd443bc2504c2d371", 1, false, 2000, 1);
 
         //mp-133 12ga pump-action shotgun
         CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "584148f2245977598f1ad387", "5c0647fdd443bc2504c2d371", 23869, "RUB", 1, false, 200000);
@@ -343,22 +343,22 @@ class JeagerAssort
 		
 		// Mosin Tacfire Tanker Style muzzle brake 
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "5bbdb83fd4351e44f824c44b", "5c0647fdd443bc2504c2d371", 500, "RUB", 2, false, 2000, 5);
+        CoreMod.CreateTraderAssort(id, "5bbdb83fd4351e44f824c44b", "5c0647fdd443bc2504c2d371", 3717, "RUB", 2, false, 2000, 5);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5bc47dbf86f7741ee74e93b9"); // The Tarkov shooter - Part 3
 		
 		// Mosin AIM Sports Recoil pad
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "5bbde409d4351e003562b036", "5c0647fdd443bc2504c2d371", 500, "RUB", 2, false, 2000, 5);
+        CoreMod.CreateTraderAssort(id, "5bbde409d4351e003562b036", "5c0647fdd443bc2504c2d371", 4084, "RUB", 2, false, 2000, 5);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5bc47dbf86f7741ee74e93b9"); // The Tarkov shooter - Part 3
 		
 		//Aim Sports "Tri-Rail" rail for Mosin rifle
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "5bbdb811d4351e45020113c7", "5c0647fdd443bc2504c2d371", 500, "RUB", 2, false, 2000, 5);
+        CoreMod.CreateTraderAssort(id, "5bbdb811d4351e45020113c7", "5c0647fdd443bc2504c2d371", 3376, "RUB", 2, false, 2000, 5);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5bc480a686f7741af0342e29"); // The Tarkov shooter - Part 4
 		
 		//Tacfire pistol grip for Mosin rifle
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "5bbde41ed4351e003562b038", "5c0647fdd443bc2504c2d371", 500, "RUB", 2, false, 2000, 5);
+        CoreMod.CreateTraderAssort(id, "5bbde41ed4351e003562b038", "5c0647fdd443bc2504c2d371", 2377, "RUB", 2, false, 2000, 5);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5bc480a686f7741af0342e29"); // The Tarkov shooter - Part 4
 		
         //5.45x39mm sp
@@ -368,7 +368,7 @@ class JeagerAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "59e6658b86f77411d949b250", "5c0647fdd443bc2504c2d371", 60, "RUB", 2, false, 80000, 200);
 
         //12/70 8.5mm "magnum" buckshot
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e6806a4b936088465b17e", "5c0647fdd443bc2504c2d371", 53, "RUB", 2, false, 170000, 200);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e6806a4b936088465b17e", "5c0647fdd443bc2504c2d371", 53, "RUB", 2, false, 200000, 200);
 
         //12/70 "poleva-6u" slug
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e689ca4b9361bc8618956", "5c0647fdd443bc2504c2d371", 72, "RUB", 2, false, 200000, 500);
@@ -420,7 +420,7 @@ class JeagerAssort
         ]], "5c0647fdd443bc2504c2d371", 2, false, 2000, 1);
 
         //gk-02 12ga muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "58272d7f2459774f6311ddfd", "5c0647fdd443bc2504c2d371", 4249, "RUB", 2, false, 200);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "58272d7f2459774f6311ddfd", "5c0647fdd443bc2504c2d371", 4249, "RUB", 2, false, 3000);
 
         //mosin weapon tuning thread adapter
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf67a1bd7f00c06585fb6f3", "5c0647fdd443bc2504c2d371", 1995, "RUB", 2, false, 2000);
@@ -439,7 +439,7 @@ class JeagerAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf79599d7f00c10875d9212", "5c0647fdd443bc2504c2d371", 3098, "RUB", 2, false, 2000, 4);
 
         //monstrum compact prism scope 2x32
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d2dc3e548f035404a1a4798", "5c0647fdd443bc2504c2d371", 31274, "RUB", 2, false, 2000, 5);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d2dc3e548f035404a1a4798", "5c0647fdd443bc2504c2d371", 31274, "RUB", 2, false, 20000, 5);
 
         //nightforce atacr 7-35x56 riflescope
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa66be6e5b5b0214e506e97", "hideout", "hideout", [[{
@@ -530,7 +530,7 @@ class JeagerAssort
         ]], "5c0647fdd443bc2504c2d371", 2, false, 2000, 1);
 
         //mp-133 custom plastic forestock with rails
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d45f484bdc2d972f8b456d", "5c0647fdd443bc2504c2d371", 9608, "RUB", 2, false, 7968);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d45f484bdc2d972f8b456d", "5c0647fdd443bc2504c2d371", 9608, "RUB", 2, false, 10000);
 
         //mp-155 ultima polymer stock
         CoreMod.CreateTraderAssort(HashUtil.generate(), "606ee5c81246154cad35d65e", "5c0647fdd443bc2504c2d371", 4608, "RUB", 2, false, 2000, 3);
@@ -630,67 +630,67 @@ class JeagerAssort
 		let id = null;
 		//remington model 700 .308 bolt-action sniper rifle arch
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5d383ee786f7742a15793860", "5c0647fdd443bc2504c2d371", 80000, "RUB", 3, false, 200, 1);
+        CoreMod.CreateTraderAssortWithPreset(id, "5d383ee786f7742a15793860", "5c0647fdd443bc2504c2d371", 65377, "RUB", 3, false, 200, 1);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5d25e4ca86f77409dd5cdf2c"); // hunting trip
 		
 		//remington model 700 .308 bolt-action sniper rifle aics
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5d383e1a86f7742a1468ce63", "5c0647fdd443bc2504c2d371", 80000, "RUB", 3, false, 200, 1);
+        CoreMod.CreateTraderAssortWithPreset(id, "5d383e1a86f7742a1468ce63", "5c0647fdd443bc2504c2d371", 65377, "RUB", 3, false, 200, 1);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5d25e4ca86f77409dd5cdf2c"); // hunting trip
 		
 		//Mosin Texas Precision Products muzzle brake
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "5bc5a351d4351e003477a414", "5c0647fdd443bc2504c2d371", 500, "RUB", 3, false, 2000, 5);
+        CoreMod.CreateTraderAssort(id, "5bc5a351d4351e003477a414", "5c0647fdd443bc2504c2d371", 7094, "RUB", 3, false, 2000, 5);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5bc4826c86f774106d22d88b"); // The Tarkov shooter - Part 5
 		
 		//Mosin Witt Machine muzzle brake
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "5bc5a35cd4351e450201232f", "5c0647fdd443bc2504c2d371", 500, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(id, "5bc5a35cd4351e450201232f", "5c0647fdd443bc2504c2d371", 5000, "RUB", 3, false, 2000);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5bc4856986f77454c317bea7"); // The Tarkov shooter - Part 7
 
         //12/70 copper sabot premier hp slug
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e68b3a4b9361bca7e50b5", "5c0647fdd443bc2504c2d371", 87, "RUB", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e68b3a4b9361bca7e50b5", "5c0647fdd443bc2504c2d371", 87, "RUB", 3, false, 20000, 150);
 
         //12/70 dual sabot slug
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e68dea4b9361bcc29e659", "5c0647fdd443bc2504c2d371", 72, "RUB", 3, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e68dea4b9361bcc29e659", "5c0647fdd443bc2504c2d371", 72, "RUB", 3, false, 200000, 200);
 
         //12/70 flechette
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e6911a4b9361bd5780d52", "5c0647fdd443bc2504c2d371", 79, "RUB", 3, false, 200000, 200);
 
         //20/70 star slug
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e6a05a4b93618084f58d0", "5c0647fdd443bc2504c2d371", 86, "RUB", 3, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e6a05a4b93618084f58d0", "5c0647fdd443bc2504c2d371", 86, "RUB", 3, false, 200000, 200);
 
         //20/70 devastator slug
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e6a5fa4b93614ec501745", "5c0647fdd443bc2504c2d371", 189, "RUB", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e6a5fa4b93614ec501745", "5c0647fdd443bc2504c2d371", 189, "RUB", 3, false, 20000, 120);
 
         //mp-153 8-shell magazine extension
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "56deeefcd2720bc8328b4568", "5c0647fdd443bc2504c2d371", 2229, "RUB", 3, false, 15000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "56deeefcd2720bc8328b4568", "5c0647fdd443bc2504c2d371", 2229, "RUB", 3, false, 15000, 4);
 
         //remington m700 .308 wyatt's outdoor 5-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfea7ad0db834001c38f1ee", "5c0647fdd443bc2504c2d371", 1943, "RUB", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfea7ad0db834001c38f1ee", "5c0647fdd443bc2504c2d371", 1943, "RUB", 3, false, 20000, 15);
 
         //remington m700 .308 wyatt's outdoor 10-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfeaa0f0db834001b734927", "5c0647fdd443bc2504c2d371", 3675, "RUB", 3, false, 2000);
 
         //VPO-101 Vepr Hunter 7.62x51 10-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c503ad32e2216398b5aada2", "5c0647fdd443bc2504c2d371", 4043, "RUB", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c503ad32e2216398b5aada2", "5c0647fdd443bc2504c2d371", 4043, "RUB", 3, false, 20000, 15);
 
         //surv12 field surgical kit
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "5d02797c86f774203f38e30a", "5c0647fdd443bc2504c2d371", 47250, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(id, "5d02797c86f774203f38e30a", "5c0647fdd443bc2504c2d371", 47250, "RUB", 3, false, 2000, 3);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5d25e46e86f77409453bce7c"); // ambulance
 
         //trijicon reap-ir scope eyecup
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a1eacb3fcdbcb09800872be", "5c0647fdd443bc2504c2d371", 374, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a1eacb3fcdbcb09800872be", "5c0647fdd443bc2504c2d371", 374, "RUB", 3, false, 2000, 5);
 
         //mp-155 ultima underbarrel mount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "606f26752535c57a13424d22", "5c0647fdd443bc2504c2d371", 1865, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "606f26752535c57a13424d22", "5c0647fdd443bc2504c2d371", 1865, "RUB", 3, false, 2000, 3);
 
         //mp-155 ultima pistol grip rubber pad
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "60785c0d232e5a31c233d51c", "5c0647fdd443bc2504c2d371", 1550, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "60785c0d232e5a31c233d51c", "5c0647fdd443bc2504c2d371", 1550, "RUB", 3, false, 2000, 3);
 
         //mosin texas precision products muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bc5a351d4351e003477a414", "5c0647fdd443bc2504c2d371", 7094, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bc5a351d4351e003477a414", "5c0647fdd443bc2504c2d371", 7094, "RUB", 3, false, 2000, 5);
 
         //vpo-101 vepr hunter rear sight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c503b1c2e221602b21d6e9d", "5c0647fdd443bc2504c2d371", 315, "RUB", 3, false, 2000);
@@ -700,10 +700,10 @@ class JeagerAssort
             "count": 2,
             "_tpl": "590c5d4b86f774784e1b9c45"
         }
-        ]], "5c0647fdd443bc2504c2d371", 3, false, 20000, 1);
+        ]], "5c0647fdd443bc2504c2d371", 3, false, 20000, 3);
 
         //eotech vudu 1-6x24 riflescope
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3b99475acfc432ff4dcbee", "5c0647fdd443bc2504c2d371", 46562, "RUB", 3, false, 3000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3b99475acfc432ff4dcbee", "5c0647fdd443bc2504c2d371", 46562, "RUB", 3, false, 3000, 3);
 
         //flir rs-32 2.25-9x 35mm 60hz thermal riflescope
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5d1b5e94d7ad1a2b865a96b0", "hideout", "hideout", [[{
@@ -716,13 +716,13 @@ class JeagerAssort
         ]], "5c0647fdd443bc2504c2d371", 3, false, 200, 1);
 
         //vss/val toz 6p29m mount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "59eb7ebe86f7740b373438ce", "5c0647fdd443bc2504c2d371", 7922, "RUB", 3, false, 15000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59eb7ebe86f7740b373438ce", "5c0647fdd443bc2504c2d371", 7922, "RUB", 3, false, 15000, 6);
 
         //jp enterprises 30mm ring scope mount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a37ca54c4a282000d72296a", "5c0647fdd443bc2504c2d371", 10735, "RUB", 3, false, 5000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a37ca54c4a282000d72296a", "5c0647fdd443bc2504c2d371", 10735, "RUB", 3, false, 5000, 5);
 
         //mp-155 ultima short rail
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "607ea812232e5a31c233d53c", "5c0647fdd443bc2504c2d371", 1050, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "607ea812232e5a31c233d53c", "5c0647fdd443bc2504c2d371", 1050, "RUB", 3, false, 2000, 4);
 
         //nightforce magmount 30mm rings
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3b99265acfc4704b4a1afb", "5c0647fdd443bc2504c2d371", 6313, "RUB", 3, false, 2000);
@@ -731,24 +731,24 @@ class JeagerAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfebc5e0db834001a6694e5", "5c0647fdd443bc2504c2d371", 3570, "RUB", 3, false, 2000);
 
         //IEA Mil-Optics 34mm one piece magmount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c86592b2e2216000e69e77c", "5c0647fdd443bc2504c2d371", 6925, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c86592b2e2216000e69e77c", "5c0647fdd443bc2504c2d371", 8925, "RUB", 3, false, 2000, 4);
 
         //mp-155 ultima top rail
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "60785ce5132d4d12c81fd918", "5c0647fdd443bc2504c2d371", 6195, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "60785ce5132d4d12c81fd918", "5c0647fdd443bc2504c2d371", 6195, "RUB", 3, false, 2000, 3);
 
         //mp-155 ultima small recoil pad
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "606ef0812535c57a13424d20", "5c0647fdd443bc2504c2d371", 2343, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "606ef0812535c57a13424d20", "5c0647fdd443bc2504c2d371", 2343, "RUB", 3, false, 2000, 3);
 
         //mosin ati monte carlo stock
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "5bbdb870d4351e00367fb67d", "5c0647fdd443bc2504c2d371", 11296, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(id, "5bbdb870d4351e00367fb67d", "5c0647fdd443bc2504c2d371", 11296, "RUB", 3, false, 2000, 5);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5bc4836986f7740c0152911c"); // The Tarkov shooter - Part 6
 		
         //mp-155 ultima medium recoil pad
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "606f262c6d0bd7580617bafa", "5c0647fdd443bc2504c2d371", 3393, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "606f262c6d0bd7580617bafa", "5c0647fdd443bc2504c2d371", 3393, "RUB", 3, false, 2000, 3);
 
         //mp-155 ultima large recoil pad
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "606f263a8900dc2d9a55b68d", "5c0647fdd443bc2504c2d371", 6543, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "606f263a8900dc2d9a55b68d", "5c0647fdd443bc2504c2d371", 6543, "RUB", 3, false, 2000, 3);
 
         //mp-133 12ga 510mm barrel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "55d4491a4bdc2d882f8b456e", "5c0647fdd443bc2504c2d371", 4207, "RUB", 3, false, 10000);
@@ -773,7 +773,7 @@ class JeagerAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "588200af24597742fa221dfb", "5c0647fdd443bc2504c2d371", 7539, "RUB", 3, false, 7000);
 
         //mp-155 ultima polymer stock (handguard)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "606ee5c81246154cad35d65e", "5c0647fdd443bc2504c2d371", 4608, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "606ee5c81246154cad35d65e", "5c0647fdd443bc2504c2d371", 4608, "RUB", 3, false, 2000, 3);
 
         //goshan cash register key
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5ad7247386f7747487619dc3", "hideout", "hideout", [[{
@@ -857,6 +857,27 @@ class JeagerAssort
             "count": 8,
             "_tpl": "5e2aef7986f7746d3f3c33f5"
         }
+        ]], "5c0647fdd443bc2504c2d371", 3, false, 2000, 1);
+		
+		
+		// Torrey Pines Logic T12W thermal reflex sight
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "609bab8b455afd752b2e6138", "hideout", "hideout", [[{
+            "count": 1,
+            "_tpl": "5d1b376e86f774252519444e"
+        }
+        ]], "5c0647fdd443bc2504c2d371", 3, false, 2000, 1);
+		
+		// OLI logistics department office key
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5ad5cfbd86f7742c825d6104", "hideout", "hideout", [[{
+            "count": 4,
+            "_tpl": "5e2af2bc86f7746d3f3c33fc"
+        },{
+            "count": 2,
+            "_tpl": "5e2af37686f774755a234b65"
+        },{
+            "count": 1,
+            "_tpl": "590a373286f774287540368b"
+        }
         ]], "5c0647fdd443bc2504c2d371", 3, false, 2000, 1);
 
     }
@@ -867,12 +888,12 @@ class JeagerAssort
 		
 		//remington model 700 .308 bolt-action sniper rifle pro
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5d383f5d86f7742a15793872", "5c0647fdd443bc2504c2d371", 80000, "RUB", 4, false, 200, 1);
+        CoreMod.CreateTraderAssortWithPreset(id, "5d383f5d86f7742a15793872", "5c0647fdd443bc2504c2d371", 72728, "RUB", 4, false, 2000, 2);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5d25e4ca86f77409dd5cdf2c"); // hunting trip
 		
 		//remington model 700 .308 bolt-action sniper rifle mrs
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5d38517786f7742a1468cf6a", "5c0647fdd443bc2504c2d371", 80000, "RUB", 4, false, 200, 1);
+        CoreMod.CreateTraderAssortWithPreset(id, "5d38517786f7742a1468cf6a", "5c0647fdd443bc2504c2d371", 72728, "RUB", 4, false, 2000, 2);
 		CoreMod.CreateTraderAssortUnlock("5c0647fdd443bc2504c2d371", "success", id, "5d25e4ca86f77409dd5cdf2c"); // hunting trip
 		
 		//Mp-155 ultima thermal camera
@@ -916,25 +937,25 @@ class JeagerAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c1127d0d174af29be75cf68", "5c0647fdd443bc2504c2d371", 1050, "RUB", 4, false, 20000, 20);
 
         //12/70 AP-20 slug
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e68a8a4b9360b6c0d54e2", "5c0647fdd443bc2504c2d371", 323, "RUB", 4, false, 80000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e68a8a4b9360b6c0d54e2", "5c0647fdd443bc2504c2d371", 367, "RUB", 4, false, 85000, 60);
 
         //12/70 shell with .50 bmg bullet
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e68c4a4b9361b93413f79", "5c0647fdd443bc2504c2d371", 131, "RUB", 4, false, 20000);
 
         //12/70 superFormance hp slug
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e68d1a4b93622fe60e845", "5c0647fdd443bc2504c2d371", 202, "RUB", 4, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e68d1a4b93622fe60e845", "5c0647fdd443bc2504c2d371", 202, "RUB", 4, false, 20000, 120);
 
         //7.62x51mm ultra nosler
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e023e88277cce2b522ff2b1", "5c0647fdd443bc2504c2d371", 336, "RUB", 4, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e023e88277cce2b522ff2b1", "5c0647fdd443bc2504c2d371", 336, "RUB", 4, false, 200000, 250);
 
         //.338 lapua magnum upz
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc382c1016cce60e8341b20", "5c0647fdd443bc2504c2d371", 788, "RUB", 4, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc382c1016cce60e8341b20", "5c0647fdd443bc2504c2d371", 788, "RUB", 4, false, 20000, 50);
 
         //Mk-18 .338 LM 10-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc23426900b1d5091531e15", "5c0647fdd443bc2504c2d371", 887, "RUB", 4, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc23426900b1d5091531e15", "5c0647fdd443bc2504c2d371", 8087, "RUB", 4, false, 20000, 4);
 
         //SilencerCo AC-858 ASR .338 LM Muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc23636016cce60e8341b05", "5c0647fdd443bc2504c2d371", 8526, "RUB", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc23636016cce60e8341b05", "5c0647fdd443bc2504c2d371", 8526, "RUB", 4, false, 2000, 2);
 
         //rb-psp2 key
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5d95d6fa86f77424484aa5e9", "hideout", "hideout", [[{
@@ -947,7 +968,7 @@ class JeagerAssort
             "count": 5,
             "_tpl": "5d4042a986f7743185265463"
         }
-        ]], "5c0647fdd443bc2504c2d371", 4, true, 10, 4);
+        ]], "5c0647fdd443bc2504c2d371", 4, true, 999999, 1);
 
         //march tactical 3-24x42 ffp optical scope
         CoreMod.CreateTraderAssort(HashUtil.generate(), "57c5ac0824597754771e88a9", "5c0647fdd443bc2504c2d371", 43697, "RUB", 4, false, 15000);
@@ -956,7 +977,7 @@ class JeagerAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa66be6e5b5b0214e506e97", "5c0647fdd443bc2504c2d371", 92187, "RUB", 4, false, 2000);
 
         //ncstar ado p4 sniper 3-9x42 riflescope
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfe6104585a0c3e995c7b82", "5c0647fdd443bc2504c2d371", 53912, "RUB", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfe6104585a0c3e995c7b82", "5c0647fdd443bc2504c2d371", 53912, "RUB", 4, false, 2000, 2);
 
         //Armasight Vulcan MG 3.5x night vision scope
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3b6e495acfc4330140bd88", "5c0647fdd443bc2504c2d371", 49298, "RUB", 4, false, 2000);
@@ -975,6 +996,26 @@ class JeagerAssort
 
         //Burris ar-p.e.p.r. 30mm ring mount
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b2389515acfc4771e1be0c0", "5c0647fdd443bc2504c2d371", 10068, "RUB", 4, false, 2000);
+		
+        //T H I C C case
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5b6d9ce188a4501afc1b2b25", "hideout", "hideout", [[{
+            "count": 2,
+            "_tpl": "59fb023c86f7746d0d4b423c"
+        }, {
+            "count": 2,
+            "_tpl": "5aafbde786f774389d0cbc0f"
+        }
+        ]], "5c0647fdd443bc2504c2d371", 4, false, 20, 1);
+		
+		// weapons case
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "59fb023c86f7746d0d4b423c", "hideout", "hideout", [[{
+            "count": 5,
+            "_tpl": "567143bf4bdc2d1a0f8b4567"
+        }, {
+            "count": 5,
+            "_tpl": "5d1b371186f774253763a656"
+        }
+        ]], "5c0647fdd443bc2504c2d371", 4, false, 2000, 1);
     }
 
     static generateJeagerAssort()
diff --git a/Ereshkigal-BaseAssortGenerator/src/mechanic.js b/Ereshkigal-BaseAssortGenerator/src/mechanic.js
index bc52736..f7757a7 100644
--- a/Ereshkigal-BaseAssortGenerator/src/mechanic.js
+++ b/Ereshkigal-BaseAssortGenerator/src/mechanic.js
@@ -266,9 +266,15 @@ class MechanicAssort{
                     }, {
                         "count": 1,
                         "_tpl": "590c311186f77424d1667482"
+                    }, {
+                        "count": 1,
+                        "_tpl": "5734795124597738002c6176"
+                    }, {
+                        "count": 1,
+                        "_tpl": "590c2c9c86f774245b1f03f2"
                     }
                 ]
-            ], "5a7c2eca46aef81a7ca2145d", 1, false, 8000, 2);
+            ], "5a7c2eca46aef81a7ca2145d", 1, false, 10000, 2);
 
         //Hk ump .45 acp submachine gun
         CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5fd2517dbdd50d684f73a474", "hideout", "hideout", [
@@ -305,6 +311,12 @@ class MechanicAssort{
                     }
                 ]
             ], "5a7c2eca46aef81a7ca2145d", 1, false, 6000, 1);
+			
+		//WI-FI Camera
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b4391a586f7745321235ab2", "5a7c2eca46aef81a7ca2145d", 39304, "RUB", 1, true, 999999);
+			
+		//Signal jammer
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ac78a9b86f7741cca0bbd8d", "5a7c2eca46aef81a7ca2145d", 19579, "RUB", 1, true, 999999);
     }
     static GenerateLL2() {
         const CoreMod = require("../../CoreMod/src/Core.js");
@@ -475,7 +487,7 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c18b90d2e2216152142466b", "5a7c2eca46aef81a7ca2145d", 2688, "RUB", 2, false, 20000, 4);
 
         //magpul mbus gen2 rear flip-up sight (flat dark earth)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c18b9192e2216398b5a8104", "5a7c2eca46aef81a7ca2145d", 4032, "RUB", 2, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c18b9192e2216398b5a8104", "5a7c2eca46aef81a7ca2145d", 4032, "RUB", 2, false, 20000, 4);
 
         //badger ordnance tactical charging handle
         CoreMod.CreateTraderBarter(HashUtil.generate(), "56ea7165d2720b6e518b4583", "hideout", "hideout", [
@@ -784,7 +796,7 @@ class MechanicAssort{
             ], "5a7c2eca46aef81a7ca2145d", 2, false, 2000, 2);
 
         //colt m4a1 5.56x45 assault rifle (lower only)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5447a9cd4bdc2dbd208b4567", "5a7c2eca46aef81a7ca2145d", 20605, "RUB", 2, false, 2000, 5);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5447a9cd4bdc2dbd208b4567", "5a7c2eca46aef81a7ca2145d", 20605, "RUB", 2, false, 2000, 2);
 
         //colt m4a1 5.56x45 assault rifle SAI
         CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5dd800eae49222636663133b", "hideout", "hideout", [
@@ -793,7 +805,7 @@ class MechanicAssort{
                         "_tpl": "5d235b4d86f7742e017bc88a"
                     }
                 ]
-            ], "5a7c2eca46aef81a7ca2145d", 2, false, 2000, 1);
+            ], "5a7c2eca46aef81a7ca2145d", 2, false, 2000, 2);
 
         //physical bitcoin
         CoreMod.CreateTraderBarter(HashUtil.generate(), "59faff1d86f7746c51718c9c", "hideout", "hideout", [
@@ -826,7 +838,7 @@ class MechanicAssort{
             ], "5a7c2eca46aef81a7ca2145d", 2, false, 2000, 1);
 
         //Molot VPO-209 .366 TKM carbine (lower)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e6687d86f77411d949b251", "5a7c2eca46aef81a7ca2145d", 24176, "RUB", 2, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e6687d86f77411d949b251", "5a7c2eca46aef81a7ca2145d", 24176, "RUB", 2, false, 2000, 5);
 
         //ak-101 5.56x45 assault rifle
         CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5acf7dd986f774486e1281bf", "5a7c2eca46aef81a7ca2145d", 42938, "RUB", 2, false, 100000);
@@ -983,6 +995,9 @@ class MechanicAssort{
                     }
                 ]
             ], "5a7c2eca46aef81a7ca2145d", 2, false, 500, 1);
+			
+		// M1911A1 hammer
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ef35d2ac64c5d0dfc0571b0", "5a7c2eca46aef81a7ca2145d", 1680, "RUB", 3, false, 2000, 3);
 
     }
     static GenerateLL3() {
@@ -990,16 +1005,16 @@ class MechanicAssort{
 		let id = null;
 
         //4.6x30mm subsonic sx
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ba26844d4351e00334c9475", "5a7c2eca46aef81a7ca2145d", 282, "RUB", 3, false, 100000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ba26844d4351e00334c9475", "5a7c2eca46aef81a7ca2145d", 282, "RUB", 3, false, 85000, 600);
 
         //9x19mm T gzh
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c3df7d588a4501f290594e5", "5a7c2eca46aef81a7ca2145d", 73, "RUB", 3, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c3df7d588a4501f290594e5", "5a7c2eca46aef81a7ca2145d", 73, "RUB", 3, false, 200000, 500);
 
         //5.7x28mm r37.x
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc86840d7f00c002412c56c", "5a7c2eca46aef81a7ca2145d", 209, "RUB", 3, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc86840d7f00c002412c56c", "5a7c2eca46aef81a7ca2145d", 209, "RUB", 3, false, 200000, 400);
 
         //.366 tkm ap-m
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f0596629e22f464da6bbdd9", "5a7c2eca46aef81a7ca2145d", 519, "RUB", 3, false, 400000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f0596629e22f464da6bbdd9", "5a7c2eca46aef81a7ca2145d", 519, "RUB", 3, false, 400000, 180);
 
         //mp5 9x19 x products x-5 50-round drum magazine
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5a351711c4a282000b1521a4", "hideout", "hideout", [
@@ -1011,7 +1026,7 @@ class MechanicAssort{
             ], "5a7c2eca46aef81a7ca2145d", 3, false, 2000, 3);
 
         //glock 9x19 sgmt 50-round drum magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a718f958dc32e00094b97e7", "5a7c2eca46aef81a7ca2145d", 89, "EUR", 3, false, 5000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a718f958dc32e00094b97e7", "5a7c2eca46aef81a7ca2145d", 89, "EUR", 3, false, 5000, 3);
 
         //m870 12ga 7-shell magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a78830bc5856700137e4c90", "5a7c2eca46aef81a7ca2145d", 1881, "RUB", 3, false, 2000);
@@ -1020,19 +1035,19 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a7ad2e851dfba0016153692", "5a7c2eca46aef81a7ca2145d", 27, "EUR", 3, false, 6000);
 
         //MP7 4.6x30 30-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ba2657ed4351e0035628ff2", "5a7c2eca46aef81a7ca2145d", 6722, "RUB", 3, false, 6000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ba2657ed4351e0035628ff2", "5a7c2eca46aef81a7ca2145d", 6722, "RUB", 3, false, 6000, 7);
 
         //m870 12ga 10-shell magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a78832ec5856700155a6ca3", "5a7c2eca46aef81a7ca2145d", 2738, "RUB", 3, false, 2000);
 
         //mpx 9x19 41-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c5db6652e221600113fba51", "5a7c2eca46aef81a7ca2145d", 5906, "RUB", 3, false, 5000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c5db6652e221600113fba51", "5a7c2eca46aef81a7ca2145d", 5906, "RUB", 3, false, 5000, 5);
 
         //armasight vulcan mg scope eyecup
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3cbc235acfc4001863ac44", "5a7c2eca46aef81a7ca2145d", 789, "RUB", 3, false, 2000);
 
         //m1911a1 caspian arms trik trigger
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ef32e4d1c1fd62aea6a150d", "5a7c2eca46aef81a7ca2145d", 4144, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ef32e4d1c1fd62aea6a150d", "5a7c2eca46aef81a7ca2145d", 4144, "RUB", 3, false, 2000, 3);
 
         //remington m700 .308 aics 10-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d25a6538abbc306c62e630d", "5a7c2eca46aef81a7ca2145d", 4368, "RUB", 3, false, 2000);
@@ -1041,18 +1056,18 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d25a6a48abbc306c62e6310", "5a7c2eca46aef81a7ca2145d", 6272, "RUB", 3, false, 2000);
 
         //m1911a1 sti hex hammer
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ef35f46382a846010715a96", "5a7c2eca46aef81a7ca2145d", 4480, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ef35f46382a846010715a96", "5a7c2eca46aef81a7ca2145d", 4480, "RUB", 3, false, 2000, 3);
 
         //magpul afg grip (olive drab)
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "588226ef24597767af46e39c", "5a7c2eca46aef81a7ca2145d", 7086, "RUB", 3, true, 999999);
+        CoreMod.CreateTraderAssort(id, "588226ef24597767af46e39c", "5a7c2eca46aef81a7ca2145d", 7086, "RUB", 3, true, 999999, 5);
 		CoreMod.CreateTraderAssortUnlock("5a7c2eca46aef81a7ca2145d", "success", id, "5b47749f86f7746c5d6a5fd4"); // gunsmith part 12
 
         //Remington M700 .308 promag aa-70 10-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d25af8f8abbc3055079fec5", "5a7c2eca46aef81a7ca2145d", 11256, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d25af8f8abbc3055079fec5", "5a7c2eca46aef81a7ca2145d", 4861, "RUB", 3, false, 2000);
 
         //Glock .45 ACP KRISS G30 MagEx 30-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb651dc85f90547f674b6f4", "5a7c2eca46aef81a7ca2145d", 6747, "RUB", 3, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb651dc85f90547f674b6f4", "5a7c2eca46aef81a7ca2145d", 4592, "RUB", 3, false, 200000, 8);
 
         //glock zev tech sight mount cap
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a71e1868dc32e00094b97f3", "5a7c2eca46aef81a7ca2145d", 1, "EUR", 3, false, 2000);
@@ -1061,19 +1076,19 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c791e872e2216001219c40a", "5a7c2eca46aef81a7ca2145d", 11256, "RUB", 3, false, 2000);
 
         //mvf001 a3 keymod vertical grip (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc0f9b5d724d907e2077d82", "5a7c2eca46aef81a7ca2145d", 8747, "RUB", 3, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc0f9b5d724d907e2077d82", "5a7c2eca46aef81a7ca2145d", 8747, "RUB", 3, false, 200000, 5);
 
         //jp enterprises gas system-6
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a34fbadc4a28200741e230a", "5a7c2eca46aef81a7ca2145d", 11517, "RUB", 3, false, 2000);
 
         //mcx gas block
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbc210bf24b94483f726481", "5a7c2eca46aef81a7ca2145d", 5040, "RUB", 3, false, 3000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbc210bf24b94483f726481", "5a7c2eca46aef81a7ca2145d", 5040, "RUB", 3, false, 3000, 5);
 
         //cmmg low profile gas block
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "6065dc8a132d4d12c81fd8e3", "5a7c2eca46aef81a7ca2145d", 9240, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "6065dc8a132d4d12c81fd8e3", "5a7c2eca46aef81a7ca2145d", 9240, "RUB", 3, false, 2000, 3);
 
         //noveske kx3 5.56x45 flash hider
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "56ea6fafd2720b844b8b4593", "5a7c2eca46aef81a7ca2145d", 6106, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "56ea6fafd2720b844b8b4593", "5a7c2eca46aef81a7ca2145d", 8106, "RUB", 3, false, 2000);
 
         //glock double diamond flash hider
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a70366c8dc32e001207fb06", "5a7c2eca46aef81a7ca2145d", 40, "EUR", 3, false, 2000);
@@ -1112,13 +1127,13 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc82796e24e8d000f5859a8", "5a7c2eca46aef81a7ca2145d", 1792, "RUB", 3, false, 2000);
 
         //ak-74 5.45x39 srvv muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc82796e24e8d000f5859a8", "5a7c2eca46aef81a7ca2145d", 6340, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc9a96cd7f00c011c04e04a", "5a7c2eca46aef81a7ca2145d", 6340, "RUB", 3, false, 2000);
 
         //ak 7.62x39 srvv muzzle brake & compensator
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc9ad73d7f00c000e2579d4", "5a7c2eca46aef81a7ca2145d", 6676, "RUB", 3, false, 2000);
 
         //Daniel Defense WAVE 5.56x45 muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cff9e5ed7ad1a09407397d4", "5a7c2eca46aef81a7ca2145d", 10457, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cff9e5ed7ad1a09407397d4", "5a7c2eca46aef81a7ca2145d", 10457, "RUB", 3, false, 20000, 8);
 
         //ar-15 nordic components corvette 5.56x45 compensator
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d02676dd7ad1a049e54f6dc", "5a7c2eca46aef81a7ca2145d", 9800, "RUB", 3, false, 2000);
@@ -1127,13 +1142,13 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d02677ad7ad1a04a15c0f95", "5a7c2eca46aef81a7ca2145d", 9400, "RUB", 3, false, 2000);
 
         //Daniel Defense WAVE 7.62x51 muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d1f819086f7744b355c219b", "5a7c2eca46aef81a7ca2145d", 8938, "RUB", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d1f819086f7744b355c219b", "5a7c2eca46aef81a7ca2145d", 8938, "RUB", 3, false, 20000, 5);
 
         //ak-74 thread type jmac customs rrd-4c multi-caliber muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f633f791b231926f2329f13", "5a7c2eca46aef81a7ca2145d", 10304, "RUB", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f633f791b231926f2329f13", "5a7c2eca46aef81a7ca2145d", 10304, "RUB", 3, false, 20000, 5);
 
         //ar-10 surefire procomp 7.62x51 muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "607ffb988900dc2d9a55b6e4", "5a7c2eca46aef81a7ca2145d", 14560, "RUB", 3, false, 4000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "607ffb988900dc2d9a55b6e4", "5a7c2eca46aef81a7ca2145d", 14560, "RUB", 3, false, 4000, 3);
 
         //remington m700 thread protection cap
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d270b3c8abbc3105335cfb8", "5a7c2eca46aef81a7ca2145d", 560, "RUB", 3, false, 2000);
@@ -1142,22 +1157,22 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d270ca28abbc31ee25ee821", "5a7c2eca46aef81a7ca2145d", 672, "RUB", 3, false, 2000);
 
         //mp9 9x19 sound suppressor adapter
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5de8f237bbaf010b10528a70", "5a7c2eca46aef81a7ca2145d", 4872, "RUB", 3, false, 6000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5de8f237bbaf010b10528a70", "5a7c2eca46aef81a7ca2145d", 4872, "RUB", 3, false, 6000, 3);
 
         //svds rotor 43 thread adapter
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e01e9e273d8eb11426f5bc3", "5a7c2eca46aef81a7ca2145d", 2016, "RUB", 3, false, 6000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e01e9e273d8eb11426f5bc3", "5a7c2eca46aef81a7ca2145d", 2016, "RUB", 3, false, 6000, 3);
 
         //ak 5.56x45 cnc warrior muzzle device adapter
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e21ca18e4d47f0da15e77dd", "5a7c2eca46aef81a7ca2145d", 2929, "RUB", 3, false, 8000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e21ca18e4d47f0da15e77dd", "5a7c2eca46aef81a7ca2145d", 2929, "RUB", 3, false, 8000, 4);
 
         //surefire socom556-mini monster 5.56x45 sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d6190f4bdc2d87028b4567", "5a7c2eca46aef81a7ca2145d", 64960, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d6190f4bdc2d87028b4567", "5a7c2eca46aef81a7ca2145d", 64960, "RUB", 3, false, 2000, 2);
 
         //mpx-sd 9x19 integrated sound suppressor
         CoreMod.CreateTraderAssort(HashUtil.generate(), "58aeac1b86f77457c419f475", "5a7c2eca46aef81a7ca2145d", 24084, "RUB", 3, false, 2000);
 
         //SilencerCo Osprey 9 9x19mm sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a32a064c4a28200741e22de", "5a7c2eca46aef81a7ca2145d", 31158, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a32a064c4a28200741e22de", "5a7c2eca46aef81a7ca2145d", 31158, "RUB", 3, false, 2000, 3);
 
         //rotor 43 7.62x39 muzzle brake
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5a9fbacda2750c00141e080f", "hideout", "hideout", [
@@ -1169,13 +1184,13 @@ class MechanicAssort{
             ], "5a7c2eca46aef81a7ca2145d", 3, false, 2000, 4);
 
         //rotor 43 5.56x45 muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a9fbacda2750c00141e080f", "5a7c2eca46aef81a7ca2145d", 55339, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a9fbacda2750c00141e080f", "5a7c2eca46aef81a7ca2145d", 55339, "RUB", 3, false, 2000, 4);
 
         //Daniel defense wave qd sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cff9e84d7ad1a049e54ed55", "5a7c2eca46aef81a7ca2145d", 57120, "RUB", 3, false, 5000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cff9e84d7ad1a049e54ed55", "5a7c2eca46aef81a7ca2145d", 57120, "RUB", 3, false, 5000, 5);
 
         //mp9 9x19 sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5de8f2d5b74cd90030650c72", "5a7c2eca46aef81a7ca2145d", 28448, "RUB", 3, false, 6000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5de8f2d5b74cd90030650c72", "5a7c2eca46aef81a7ca2145d", 28448, "RUB", 3, false, 6000, 3);
 
         //fn p90 ring sight reflex sight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cebec38d7f00c00110a652a", "5a7c2eca46aef81a7ca2145d", 17360, "RUB", 3, false, 2000);
@@ -1190,21 +1205,21 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5addba3e5acfc4001669f0ab", "5a7c2eca46aef81a7ca2145d", 1824, "RUB", 3, false, 2000);
 
         //sa-58 holland type rear sight
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b0bc22d5acfc47a8607f085", "5a7c2eca46aef81a7ca2145d", 527, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b0bc22d5acfc47a8607f085", "5a7c2eca46aef81a7ca2145d", 527, "RUB", 3, false, 2000, 5);
 
         //torrey pines logic t12w thermal reflex sight
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "609bab8b455afd752b2e6138", "5a7c2eca46aef81a7ca2145d", 110357, "RUB", 3, false, 600);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "609bab8b455afd752b2e6138", "5a7c2eca46aef81a7ca2145d", 110357, "RUB", 3, false, 600, 1);
 
         //steiner las/tac 2 tactical flashlight
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "5b07dd285acfc4001754240d", "5a7c2eca46aef81a7ca2145d", 23416, "RUB", 3, true, 999999);
+        CoreMod.CreateTraderAssort(id, "5b07dd285acfc4001754240d", "5a7c2eca46aef81a7ca2145d", 23416, "RUB", 3, true, 999999, 5);
 		CoreMod.CreateTraderAssortUnlock("5a7c2eca46aef81a7ca2145d", "success", id, "5b477b6f86f7747290681823"); // gunsmith part 14
 
         //zenit klesch-2u tactical flashlight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3a337e5acfc4704b4a19a0", "5a7c2eca46aef81a7ca2145d", 12767, "RUB", 3, false, 2000);
 
         //ar-15 radian weapons raptor charging handle
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b2240bf5acfc40dc528af69", "5a7c2eca46aef81a7ca2145d", 6698, "RUB", 3, false, 8000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b2240bf5acfc40dc528af69", "5a7c2eca46aef81a7ca2145d", 8698, "RUB", 3, false, 8000, 7);
 
         //m870 xs shotrail rail with ghost ring
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a78948ec5856700177b1124", "5a7c2eca46aef81a7ca2145d", 6638, "RUB", 3, false, 2000);
@@ -1213,10 +1228,10 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a966ec8a2750c00171b3f36", "5a7c2eca46aef81a7ca2145d", 5042, "RUB", 3, false, 2000);
 
         //strike industries keymod 4 inch rail
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a9d6d00a2750c5c985b5305", "5a7c2eca46aef81a7ca2145d", 1470, "RUB", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a9d6d00a2750c5c985b5305", "5a7c2eca46aef81a7ca2145d", 1470, "RUB", 3, false, 20000, 5);
 
         //strike industries keymod 6 inch rail
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a9d6d13a2750c00164f6b03", "5a7c2eca46aef81a7ca2145d", 1742, "RUB", 3, false, 13000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a9d6d13a2750c00164f6b03", "5a7c2eca46aef81a7ca2145d", 1742, "RUB", 3, false, 15000, 7);
 
         //vss/val b-3 mount combo
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a9fc7e6a2750c0032157184", "5a7c2eca46aef81a7ca2145d", 6155, "RUB", 3, false, 2000);
@@ -1249,13 +1264,13 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc7015ae4a949001152b4c6", "5a7c2eca46aef81a7ca2145d", 1120, "RUB", 3, false, 2000);
 
         //svd sag low sidemount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dff8db859400025ea5150d4", "5a7c2eca46aef81a7ca2145d", 10192, "RUB", 3, false, 6000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dff8db859400025ea5150d4", "5a7c2eca46aef81a7ca2145d", 10192, "RUB", 3, false, 6000, 5);
 
         //m590a1 tactical rail
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5eeb2ff5ea4f8b73c827350b", "5a7c2eca46aef81a7ca2145d", 6608, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5eeb2ff5ea4f8b73c827350b", "5a7c2eca46aef81a7ca2145d", 6608, "RUB", 3, false, 2000, 4);
 
         //kriss vector mk.5 modular rail
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbb978207e8a97d1f0902d3", "5a7c2eca46aef81a7ca2145d", 2464, "RUB", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbb978207e8a97d1f0902d3", "5a7c2eca46aef81a7ca2145d", 2464, "RUB", 3, false, 20000, 5);
 
         //troy m7a1 pdw stock (flat dark earth)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "591af10186f774139d495f0e", "5a7c2eca46aef81a7ca2145d", 8334, "RUB", 3, false, 2000);
@@ -1267,7 +1282,7 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a788169c5856700142fdd9e", "5a7c2eca46aef81a7ca2145d", 2851, "RUB", 3, false, 2000);
 
         //m1a promag archangel stock
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5addbf175acfc408fb13965b", "5a7c2eca46aef81a7ca2145d", 27846, "RUB", 3, false, 3000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5addbf175acfc408fb13965b", "5a7c2eca46aef81a7ca2145d", 27846, "RUB", 3, false, 3000, 5);
 
         //m14 sage international m14alcs (mod-0) handguard
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5addc7005acfc4001669f275", "5a7c2eca46aef81a7ca2145d", 15097, "RUB", 3, false, 2000);
@@ -1282,10 +1297,10 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b0800175acfc400153aebd4", "5a7c2eca46aef81a7ca2145d", 11357, "RUB", 3, false, 2000);
 
         //sa-58 brs stock
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b7d64555acfc4001876c8e2", "5a7c2eca46aef81a7ca2145d", 18088, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b7d64555acfc4001876c8e2", "5a7c2eca46aef81a7ca2145d", 18088, "RUB", 3, false, 2000, 4);
 
         //hk enhanced tube buffer tube
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bb20e58d4351e00320205d7", "5a7c2eca46aef81a7ca2145d", 5589, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bb20e58d4351e00320205d7", "5a7c2eca46aef81a7ca2145d", 5589, "RUB", 3, false, 2000, 4);
 
         //hk slim line stock
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5bb20e70d4351e0035629f8f", "5a7c2eca46aef81a7ca2145d", 5712, "RUB", 3, false, 2000);
@@ -1312,10 +1327,10 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d25d0ac8abbc3054f3e61f7", "5a7c2eca46aef81a7ca2145d", 29680, "RUB", 3, false, 2000);
 
         //mcx telescoping stock
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbcc429900b1d5091531dd7", "5a7c2eca46aef81a7ca2145d", 5420, "RUB", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbcc429900b1d5091531dd7", "5a7c2eca46aef81a7ca2145d", 5420, "RUB", 3, false, 20000, 5);
 
         //akm/ak-74 promag archangel opfor aa47 buttstock
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "6087e2a5232e5a31c233d552", "5a7c2eca46aef81a7ca2145d", 21952, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "6087e2a5232e5a31c233d552", "5a7c2eca46aef81a7ca2145d", 21952, "RUB", 3, false, 2000, 4);
 
         //m870 12ga 660mm vent rib barrel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a787fadc5856700155a6ca1", "5a7c2eca46aef81a7ca2145d", 15921, "RUB", 3, false, 2000);
@@ -1348,7 +1363,7 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5addc7db5acfc4001669f279", "5a7c2eca46aef81a7ca2145d", 2927, "RUB", 3, false, 2000);
 
         //mk47 254mm barrel
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "60658776f2cb2e02a42ace2b", "5a7c2eca46aef81a7ca2145d", 19376, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "60658776f2cb2e02a42ace2b", "5a7c2eca46aef81a7ca2145d", 19376, "RUB", 3, false, 2000, 4);
 
         //m870 speedfeed short handguard
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a788089c5856700142fdd9c", "5a7c2eca46aef81a7ca2145d", 1571, "RUB", 3, false, 2000);
@@ -1387,16 +1402,16 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d19cd96d7ad1a4a992c9f52", "5a7c2eca46aef81a7ca2145d", 11424, "RUB", 3, false, 2000);
 
         //sok-12 bravo-18 aluminum handguard
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f63418ef5750b524b45f116", "5a7c2eca46aef81a7ca2145d", 14784, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f63418ef5750b524b45f116", "5a7c2eca46aef81a7ca2145d", 14784, "RUB", 3, false, 2000, 3);
 
         //svd sag mk1 freefloat chassis
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfcd0e547101c39625f66f9", "5a7c2eca46aef81a7ca2145d", 17808, "RUB", 3, false, 6000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfcd0e547101c39625f66f9", "5a7c2eca46aef81a7ca2145d", 17808, "RUB", 3, false, 6000, 2);
 
         //ar-15 tactical dynamics skeletonized pistol grip
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b07db875acfc40dc528a5f6", "5a7c2eca46aef81a7ca2145d", 6257, "RUB", 3, true, 999999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b07db875acfc40dc528a5f6", "5a7c2eca46aef81a7ca2145d", 6257, "RUB", 3, true, 999999, 5);
 
         //ak magpul moe pistol grip
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b30ac585acfc433000eb79c", "5a7c2eca46aef81a7ca2145d", 8239, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b30ac585acfc433000eb79c", "5a7c2eca46aef81a7ca2145d", 8239, "RUB", 3, false, 2000, 5);
 
         //p226 axelson tactical mk.25 pistol grip
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5bffec120db834001c38f5fa", "5a7c2eca46aef81a7ca2145d", 3360, "RUB", 3, false, 2000);
@@ -1405,7 +1420,7 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0006470db834001a6697fe", "5a7c2eca46aef81a7ca2145d", 2744, "RUB", 3, false, 2000);
 
         //mdr pistol grip
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c48a2c22e221602b313fb6c", "5a7c2eca46aef81a7ca2145d", 2599, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c48a2c22e221602b313fb6c", "5a7c2eca46aef81a7ca2145d", 2599, "RUB", 3, false, 2000, 4);
 
         //ak strike industries enhanced pistol grip
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf50850d7f00c056e24104c", "5a7c2eca46aef81a7ca2145d", 4368, "RUB", 3, false, 2000);
@@ -1420,7 +1435,7 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a7afa25e899ef00135e31b0", "5a7c2eca46aef81a7ca2145d", 125, "EUR", 3, false, 2000);
 
         //sa-58 extreme duty dust cover
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b099bb25acfc400186331e8", "5a7c2eca46aef81a7ca2145d", 12957, "RUB", 3, false, 4000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b099bb25acfc400186331e8", "5a7c2eca46aef81a7ca2145d", 12957, "RUB", 3, false, 4000, 4);
 
         //p226 axelson tactical mk.25 pistol slide
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5bffe7c50db834001d23ece1", "5a7c2eca46aef81a7ca2145d", 11088, "RUB", 3, false, 2000);
@@ -1429,10 +1444,10 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c010a700db834001d23ef5d", "5a7c2eca46aef81a7ca2145d", 6474, "RUB", 3, false, 2000);
 
         //ak tws dog leg rail dust cover
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d2c772c48f0355d95672c25", "5a7c2eca46aef81a7ca2145d", 12992, "RUB", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d2c772c48f0355d95672c25", "5a7c2eca46aef81a7ca2145d", 12992, "RUB", 3, false, 20000, 4);
 
         //svds custom dust cover
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfce88fe9dc277128008b2e", "5a7c2eca46aef81a7ca2145d", 1624, "RUB", 3, false, 6000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfce88fe9dc277128008b2e", "5a7c2eca46aef81a7ca2145d", 1624, "RUB", 3, false, 6000, 3);
 
         //m4a1 lvoa
         CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5bbf1c5a88a45017bb03d7aa", "hideout", "hideout", [
@@ -1497,7 +1512,7 @@ class MechanicAssort{
         CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5acf7dfc86f774401e19c390", "5a7c2eca46aef81a7ca2145d", 58119, "RUB", 3, false, 25000);
 
         //springfield armory m1a 7.62x51 carbine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aafa857e5b5b00018480968", "5a7c2eca46aef81a7ca2145d", 33896, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aafa857e5b5b00018480968", "5a7c2eca46aef81a7ca2145d", 33896, "RUB", 3, false, 2000, 1);
 
         //glock 17 9x19 pistol fischer
         CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5a88aed086f77476cd391963", "hideout", "hideout", [
@@ -1564,6 +1579,9 @@ class MechanicAssort{
                     }, {
                         "count": 4,
                         "_tpl": "5d1b309586f77425227d1676"
+                    }, {
+                        "count": 1,
+                        "_tpl": "5d03775b86f774203e7e0c4b"
                     }
                 ]
             ], "5a7c2eca46aef81a7ca2145d", 3, false, 2000, 1);
@@ -1585,7 +1603,14 @@ class MechanicAssort{
                     }
                 ]
             ], "5a7c2eca46aef81a7ca2145d", 3, false, 50, 1);
+			
+		//Rotor 43 5.56x45 muzzle brake
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a9fbb84a2750c00137fa685", "5a7c2eca46aef81a7ca2145d", 55339, "RUB", 3, false, 2000, 5);
+		
+		// AK-74 5.45x39 SRVV muzzle brake
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc9a96cd7f00c011c04e04a", "5a7c2eca46aef81a7ca2145d", 6340, "RUB", 3, false, 2000, 4);
     }
+	
     static GenerateLL4() {
         const CoreMod = require("../../CoreMod/src/Core.js");
 		let id = null;
@@ -1668,7 +1693,7 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a7037338dc32e000d46d257", "5a7c2eca46aef81a7ca2145d", 45, "EUR", 4, false, 2000);
 
         //ak troy industries handguard & gas block combo
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b237e425acfc4771e1be0b6", "5a7c2eca46aef81a7ca2145d", 21540, "RUB", 4, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b237e425acfc4771e1be0b6", "5a7c2eca46aef81a7ca2145d", 21540, "RUB", 4, false, 2000);
 
         //glock 9x19 carver custom 4 port muzzle brake
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a7ad0c451dfba0013379712", "5a7c2eca46aef81a7ca2145d", 55, "EUR", 4, false, 2000);
@@ -1677,7 +1702,7 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a7b32a2e899ef00135e345a", "5a7c2eca46aef81a7ca2145d", 58, "EUR", 4, false, 2000);
 
         //vendetta precision 5.56x45 vp-09 interceptor muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a7c147ce899ef00150bd8b8", "5a7c2eca46aef81a7ca2145d", 101, "EUR", 4, false, 5000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a7c147ce899ef00150bd8b8", "5a7c2eca46aef81a7ca2145d", 101, "EUR", 4, false, 6000);
 
         //m1a smith enterprise socom 16 7.62x51 threaded muzzle brake & compensator
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5ab3afb2d8ce87001660304d", "5a7c2eca46aef81a7ca2145d", 5499, "RUB", 4, false, 2000);
@@ -1695,7 +1720,7 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf6937cd7f00c056c53fb39", "5a7c2eca46aef81a7ca2145d", 16532, "RUB", 4, false, 20000, 4);
 
         //ar-10 fortis red brake 7.62x51 muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f633f68f5750b524b45f112", "5a7c2eca46aef81a7ca2145d", 20456, "RUB", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d026791d7ad1a04a067ea63", "5a7c2eca46aef81a7ca2145d", 20456, "RUB", 4, false, 2000);
 
         //ak 7.62x39 jmac rrd-4c muzzle brake
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5f633f68f5750b524b45f112", "5a7c2eca46aef81a7ca2145d", 14672, "RUB", 4, false, 20000, 5);
@@ -1710,7 +1735,7 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b363e1b5acfc4771e1c5e80", "5a7c2eca46aef81a7ca2145d", 896, "RUB", 4, false, 2000);
 
         //surefire socom556-monster 5.56x45 sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d614004bdc2d86028b4568", "5a7c2eca46aef81a7ca2145d", 46160, "RUB", 4, false, 2000, 2);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d614004bdc2d86028b4568", "5a7c2eca46aef81a7ca2145d", 48160, "RUB", 4, false, 2000, 2);
 
         //glock 9x19 fischer development fd917 sound suppressor
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a7ad74e51dfba0015068f45", "5a7c2eca46aef81a7ca2145d", 391, "EUR", 4, false, 6000);
@@ -1790,7 +1815,7 @@ class MechanicAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b7be4645acfc400170e2dcc", "5a7c2eca46aef81a7ca2145d", 1463, "RUB", 4, false, 2000);
 
         //vltor casv 5 inch rail
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b7be46e5acfc400170e2dcf", "5a7c2eca46aef81a7ca2145d", 1715, "RUB", 4, false, 2000, 6);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b7be46e5acfc400170e2dcf", "5a7c2eca46aef81a7ca2145d", 1715, "RUB", 4, false, 15000, 6);
 
         //hexagon medium length rail
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b800ebc86f774394e230a90", "5a7c2eca46aef81a7ca2145d", 1650, "RUB", 4, false, 2000);
@@ -1918,11 +1943,11 @@ class MechanicAssort{
         //fn p90 effen 90 upper receiver
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc700ede4a949033c734315", "5a7c2eca46aef81a7ca2145d", 4256, "RUB", 4, false, 2000);
 
-        //ds arms sa-58 7.62x51 assault rifle (not preset)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b0bbe4e5acfc40dc528a72d", "5a7c2eca46aef81a7ca2145d", 42665, "RUB", 4, false, 2000, 2);
+        //ds arms sa-58 7.62x51 assault rifle lower (not preset)
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b0bbe4e5acfc40dc528a72d", "5a7c2eca46aef81a7ca2145d", 42665, "RUB", 4, false, 2000, 1);
 
-        //hk 416a5 5.56x45 assault rifle (not preset)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bb2475ed4351e00853264e3", "5a7c2eca46aef81a7ca2145d", 24416, "RUB", 4, false, 2000, 3);
+        //hk 416a5 5.56x45 assault rifle lower (not preset)
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bb2475ed4351e00853264e3", "5a7c2eca46aef81a7ca2145d", 24416, "RUB", 4, false, 2000, 5);
 
         //terragroup labs access keycard
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5c94bbff86f7747ee735c08f", "hideout", "hideout", [
@@ -1931,7 +1956,7 @@ class MechanicAssort{
                         "_tpl": "5d235b4d86f7742e017bc88a"
                     }
                 ]
-            ], "5a7c2eca46aef81a7ca2145d", 4, false, 2000, 5);
+            ], "5a7c2eca46aef81a7ca2145d", 4, false, 100, 1);
 
         //ds arms sa-58 7.62x51 assault rifle pbr
         CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5b83f29886f7746d956305a1", "hideout", "hideout", [
@@ -1958,6 +1983,9 @@ class MechanicAssort{
                 ]
             ], "5a7c2eca46aef81a7ca2145d", 4, false, 200, 1);
 		CoreMod.CreateTraderAssortUnlock("5a7c2eca46aef81a7ca2145d", "success", id, "5f04886a3937dc337a6b8238"); // chemistry closet
+		
+		// AR-10 Fortis RED Brake 7.62x51 muzzle brake
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d026791d7ad1a04a067ea63", "5a7c2eca46aef81a7ca2145d", 20496, "RUB", 4, false, 2000);
 
     }
     static generateMechanicAssort() {
diff --git a/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js b/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js
index 3d0466d..53b395c 100644
--- a/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js
+++ b/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js
@@ -16,7 +16,7 @@ class PeacekeeperAssort
         let id = null;
         //                               ASSORT ID            ITEM TEMPLATE               TRADER ID             PRICE   CURRENCY   LOYALTY   UNLIMITED      STOCK   MAXIMUM BUY
         //M855
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "54527a984bdc2d4e668b4567", "5935c25fb3acc3127c3d8cd9", 2, "USD", 1, false, 1000000, 300);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "54527a984bdc2d4e668b4567", "5935c25fb3acc3127c3d8cd9", 2, "USD", 1, false, 5000000, 300);
 
         //9x19 pst gzh
         CoreMod.CreateTraderAssort(HashUtil.generate(), "56d59d3ad2720bdb418b4577", "5935c25fb3acc3127c3d8cd9", 1, "USD", 1, true, 999999);
@@ -115,7 +115,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "58d39d3d86f77445bb794ae7", "5935c25fb3acc3127c3d8cd9", 24, "USD", 1, false, 15000, 4);
 
         //MP5 MFI HK universal low profile scope mount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5926dad986f7741f82604363", "5935c25fb3acc3127c3d8cd9", 74, "USD", 1, false, 2000, 4);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5926dad986f7741f82604363", "5935c25fb3acc3127c3d8cd9", 74, "USD", 1, false, 15000, 4);
 
         //High Standard M4SS Stock
         CoreMod.CreateTraderAssort(HashUtil.generate(), "55d4ae6c4bdc2d8b2f8b456e", "5935c25fb3acc3127c3d8cd9", 30, "USD", 1, false, 2000, 5);
@@ -216,13 +216,12 @@ class PeacekeeperAssort
 
         // m856a1
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "59e6906286f7746c9f75e847", "5935c25fb3acc3127c3d8cd9", 3, "USD", 2, false, 2000, 300);
+        CoreMod.CreateTraderAssort(id, "59e6906286f7746c9f75e847", "5935c25fb3acc3127c3d8cd9", 3, "USD", 2, false, 500000, 300);
         CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5a27b9de86f77464e5044585"); // the cult part 1
 
-        //TODO
         // m67 hand grenade
 		id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "58d3db5386f77426186285a0", "5935c25fb3acc3127c3d8cd9", 30, "USD", 2, false, 2000, 300);
+        CoreMod.CreateTraderAssort(id, "58d3db5386f77426186285a0", "5935c25fb3acc3127c3d8cd9", 78, "USD", 2, false, 500000, 10);
         CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5a03173786f77451cb427172"); // spa tour part 2
 
         //TODO
@@ -232,7 +231,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5c0d4e61d09282029f53920e"); // the guide
 
         //M80
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "58dd3ad986f77403051cba8f", "5935c25fb3acc3127c3d8cd9", 3, "USD", 2, false, 150000, 200);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "58dd3ad986f77403051cba8f", "5935c25fb3acc3127c3d8cd9", 3, "USD", 2, false, 500000, 200);
 
         //MK 255 Mod 0 (RRLP)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "59e6918f86f7746c9f75e849", "5935c25fb3acc3127c3d8cd9", 2, "USD", 2, true, 999999);
@@ -247,7 +246,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5efb0e16aeb21837e749c7ff", "5935c25fb3acc3127c3d8cd9", 2, "USD", 2, false, 500000, 200);
 
         //5.56x45 Magpul PMAG GEN M3 30 STANAG 30-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aaa5dfee5b5b000140293d3", "5935c25fb3acc3127c3d8cd9", 37, "USD", 2, false, 15000, 20);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aaa5dfee5b5b000140293d3", "5935c25fb3acc3127c3d8cd9", 30, "USD", 2, false, 15000, 12);
 
         //AK 7.62x39 Magpul PMAG 30 GEN M3 30-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "59d6272486f77466146386ff", "5935c25fb3acc3127c3d8cd9", 35, "USD", 2, false, 30000, 10);
@@ -286,7 +285,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5df8f535bb49d91fb446d6b0", "5935c25fb3acc3127c3d8cd9", 18, "USD", 2, false, 20000, 10);
 
         //M1911A1 .45 ACP 7-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e81c4ca763d9f754677befa", "5935c25fb3acc3127c3d8cd9", 11, "USD", 2, true, 999999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e81c4ca763d9f754677befa", "5935c25fb3acc3127c3d8cd9", 11, "USD", 2, true, 999999, 8);
 
         //HK UMP .45 ACP 25-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc3e466187fea44d52eda90", "5935c25fb3acc3127c3d8cd9", 23, "USD", 2, true, 999999);
@@ -402,7 +401,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a33bab6c4a28200741e22f8", "5935c25fb3acc3127c3d8cd9", 60, "USD", 2, false, 2000);
 
         //SIG Sauer ROMEO sights mount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b31163c5acfc400153b71cb", "5935c25fb3acc3127c3d8cd9", 18, "USD", 2, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b31163c5acfc400153b71cb", "5935c25fb3acc3127c3d8cd9", 18, "USD", 2, false, 2000, 3);
 
         //HK UMP bottom handguard rail
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc53954f8b6a877a729eaeb", "5935c25fb3acc3127c3d8cd9", 16, "USD", 2, false, 20000, 5);
@@ -577,7 +576,7 @@ class PeacekeeperAssort
 
         //P226R
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "584149242459775a7726350a", "5935c25fb3acc3127c3d8cd9", 133, "USD", 2, false, 15000, 2);
+        CoreMod.CreateTraderAssortWithPreset(id, "584149242459775a7726350a", "5935c25fb3acc3127c3d8cd9", 133, "USD", 2, false, 15000, 5);
 
         //M1911
         id = HashUtil.generate();
@@ -610,7 +609,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d5e7d28a4b936645d161203", "5935c25fb3acc3127c3d8cd9", 445, "USD", 2, false, 20000, 5);
 
         //Secure container Alpha
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "544a11ac4bdc2d470e8b456a", "5935c25fb3acc3127c3d8cd9", 8139, "USD", 2, false, 1500, 1);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "544a11ac4bdc2d470e8b456a", "5935c25fb3acc3127c3d8cd9", 8246, "USD", 2, false, 1500, 1);
 
         //Secure container beta
 		id = HashUtil.generate();
@@ -663,38 +662,38 @@ class PeacekeeperAssort
 
         //7.62x51mm m62
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "5a608bf24f39f98ffc77720e", "5935c25fb3acc3127c3d8cd9", 8, "USD", 3, false, 300000);
+        CoreMod.CreateTraderAssort(id, "5a608bf24f39f98ffc77720e", "5935c25fb3acc3127c3d8cd9", 8, "USD", 3, false, 300000, 200);
         CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5a27ba9586f7741b543d8e85"); // spa tour part 2
 
         //4.6x30mm fmj sx
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ba2678ad4351e44f824b344", "5935c25fb3acc3127c3d8cd9", 3, "USD", 3, false, 500000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ba2678ad4351e44f824b344", "5935c25fb3acc3127c3d8cd9", 3, "USD", 3, false, 500000, 250);
 
         //4.6x30mm action sx
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ba26812d4351e003201fef1", "5935c25fb3acc3127c3d8cd9", 2, "USD", 3, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ba26812d4351e003201fef1", "5935c25fb3acc3127c3d8cd9", 2, "USD", 3, false, 200000, 400);
 
         //5.7x28mm ss190
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc80f38e4a949001152b560", "5935c25fb3acc3127c3d8cd9", 4, "USD", 3, false, 300000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc80f38e4a949001152b560", "5935c25fb3acc3127c3d8cd9", 4, "USD", 3, false, 300000, 220);
 
         //5.7x28mm l191
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc80f53e4a949000e1ea4f8", "5935c25fb3acc3127c3d8cd9", 2, "USD", 3, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc80f53e4a949000e1ea4f8", "5935c25fb3acc3127c3d8cd9", 2, "USD", 3, false, 200000, 300);
 
         //5.7x28mm sb193
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc80f67e4a949035e43bbba", "5935c25fb3acc3127c3d8cd9", 2, "USD", 3, true, 999999);
 
         //5.7x28mm ss198lf
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc80f79e4a949033c7343b2", "5935c25fb3acc3127c3d8cd9", 2, "USD", 3, false, 150000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc80f79e4a949033c7343b2", "5935c25fb3acc3127c3d8cd9", 2, "USD", 3, false, 150000, 300);
 
         //.45 acp ap
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5efb0cabfb3e451d70735af5", "5935c25fb3acc3127c3d8cd9", 4, "USD", 3, false, 500000, 200);
 
         //.45 acp hydra-shok
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5efb0fc6aeb21837e749c801", "5935c25fb3acc3127c3d8cd9", 2, "USD", 3, false, 600000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5efb0fc6aeb21837e749c801", "5935c25fb3acc3127c3d8cd9", 2, "USD", 3, false, 500000, 150);
 
         //.300 aac blackout ap
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fd20ff893a8961fc660a954", "5935c25fb3acc3127c3d8cd9", 7, "USD", 3, false, 400000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fd20ff893a8961fc660a954", "5935c25fb3acc3127c3d8cd9", 7, "USD", 3, false, 500000, 300);
 
         //5.56x45mm mk 318 mod 0 (sost)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "60194943740c5d77f6705eea", "5935c25fb3acc3127c3d8cd9", 3, "USD", 3, false, 800000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "60194943740c5d77f6705eea", "5935c25fb3acc3127c3d8cd9", 3, "USD", 3, false, 800000, 240);
 
         //5.56x45 magpul pmag gen m3 40 stanag 40-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "544a378f4bdc2d30388b4567", "5935c25fb3acc3127c3d8cd9", 60, "USD", 3, false, 15000);
@@ -726,13 +725,13 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5a27bbf886f774333a418eeb"); // wet job part 2
 
         //ak 7.62x39 palm us ak30 30-round magazine (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "59fafc5086f7740dbe19f6c3", "5935c25fb3acc3127c3d8cd9", 22, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59fafc5086f7740dbe19f6c3", "5935c25fb3acc3127c3d8cd9", 22, "USD", 3, false, 20000, 10);
 
         //ak 7.62x39 palm us ak30 30-round magazine (flat dark earth)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "59fafc9386f774067d462453", "5935c25fb3acc3127c3d8cd9", 21, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59fafc9386f774067d462453", "5935c25fb3acc3127c3d8cd9", 21, "USD", 3, false, 20000, 12);
 
         //5.56x45 magpul pmag gen m3 30 stanag 30-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aaa5dfee5b5b000140293d3", "5935c25fb3acc3127c3d8cd9", 31, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aaa5dfee5b5b000140293d3", "5935c25fb3acc3127c3d8cd9", 31, "USD", 3, false, 20000, 12);
 
         //m1a 7.62x51 20-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5aaf8a0be5b5b00015693243", "5935c25fb3acc3127c3d8cd9", 24, "USD", 3, true, 999999);
@@ -744,10 +743,10 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c05413a0db834001c390617", "5935c25fb3acc3127c3d8cd9", 35, "USD", 3, false, 20000);
 
         //sks 7.62x39 promag aalvx 35-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c5970672e221602b21d7855", "5935c25fb3acc3127c3d8cd9", 162, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c5970672e221602b21d7855", "5935c25fb3acc3127c3d8cd9", 162, "USD", 3, false, 2000, 6);
 
         //fn p90 5.7x28 50-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc70093e4a949033c734312", "5935c25fb3acc3127c3d8cd9", 102, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc70093e4a949033c734312", "5935c25fb3acc3127c3d8cd9", 102, "USD", 3, false, 20000, 10);
 
         //5.56x45 Magpul PMAG GEN M3 W 30 STANAG 30-round magazine (Flat Dark Earth)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d1340cad7ad1a0b0b249869", "5935c25fb3acc3127c3d8cd9", 31, "USD", 3, false, 20000);
@@ -756,19 +755,19 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d1340bdd7ad1a0e8d245aab", "5935c25fb3acc3127c3d8cd9", 60, "USD", 3, false, 20000);
 
         //mp9 9x19 25-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5de8eaadbbaf010b10528a6d", "5935c25fb3acc3127c3d8cd9", 25, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5de8eaadbbaf010b10528a6d", "5935c25fb3acc3127c3d8cd9", 25, "USD", 3, false, 20000, 10);
 
         //mp9 9x19 30-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5de8eac42a78646d96665d91", "5935c25fb3acc3127c3d8cd9", 40, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5de8eac42a78646d96665d91", "5935c25fb3acc3127c3d8cd9", 40, "USD", 3, false, 20000, 10);
 
         //5.56x45 hk 30 stanag polymer 30-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c6d42cb2e2216000e69d7d1", "5935c25fb3acc3127c3d8cd9", 39, "USD", 3, false, 20000);
 
         //kac 7.62x51 20-round steel magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5df8f541c41b2312ea3335e3", "5935c25fb3acc3127c3d8cd9", 24, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5df8f541c41b2312ea3335e3", "5935c25fb3acc3127c3d8cd9", 24, "USD", 3, false, 20000, 10);
 
         //m1911a1 .45 acp mec-gar 11-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ef3448ab37dfd6af863525c", "5935c25fb3acc3127c3d8cd9", 21, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ef3448ab37dfd6af863525c", "5935c25fb3acc3127c3d8cd9", 21, "USD", 3, false, 20000, 7);
 
         //kac urx 3/3.1 short panel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d123a3cd7ad1a004e476058", "5935c25fb3acc3127c3d8cd9", 12, "USD", 3, false, 2000);
@@ -789,7 +788,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d124c1ad7ad1a12227c53a7", "5935c25fb3acc3127c3d8cd9", 28, "USD", 3, false, 2000);
 
         //magpul m-lok afg tactical grip (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "57cffb66245977632f391a99", "5935c25fb3acc3127c3d8cd9", 79, "USD", 3, false, 15000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "57cffb66245977632f391a99", "5935c25fb3acc3127c3d8cd9", 79, "USD", 3, false, 15000, 4);
 
         //magpul m-lok afg tactical grip (flat dark earth)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "57cffcd624597763133760c5", "5935c25fb3acc3127c3d8cd9", 68, "USD", 3, false, 15000);
@@ -813,22 +812,22 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "591af28e86f77414a27a9e1d", "5935c25fb3acc3127c3d8cd9", 64, "USD", 3, false, 15000);
 
         //magpul rvg foregrip (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "59fc48e086f77463b1118392", "5935c25fb3acc3127c3d8cd9", 80, "USD", 3, false, 6000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59fc48e086f77463b1118392", "5935c25fb3acc3127c3d8cd9", 80, "USD", 3, false, 6000, 4);
 
         //tactical dynamics aluminum skeletonized vertical grip
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f6340d3ca442212f4047eb2", "5935c25fb3acc3127c3d8cd9", 73, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f6340d3ca442212f4047eb2", "5935c25fb3acc3127c3d8cd9", 73, "USD", 3, false, 20000, 5);
 
         //sig sauer vertical foregrip keymod (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc0f9cbd6fa9c00c571bb90", "5935c25fb3acc3127c3d8cd9", 64, "USD", 3, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc0f9cbd6fa9c00c571bb90", "5935c25fb3acc3127c3d8cd9", 64, "USD", 3, false, 200000, 5);
 
         //magpul rvg foregrip (flat dark earth)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fce0cf655375d18a253eff0", "5935c25fb3acc3127c3d8cd9", 69, "USD", 3, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fce0cf655375d18a253eff0", "5935c25fb3acc3127c3d8cd9", 69, "USD", 3, false, 200000, 5);
 
         //ak kiba arms vdm cs gas tube
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a01ad4786f77450561fda02", "5935c25fb3acc3127c3d8cd9", 29, "USD", 3, false, 4000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a01ad4786f77450561fda02", "5935c25fb3acc3127c3d8cd9", 29, "USD", 3, false, 4000, 6);
 
         //aac blackout 51t 5.56x45 flash hider
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c7e5f112e221600106f4ede", "5935c25fb3acc3127c3d8cd9", 70, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c7e5f112e221600106f4ede", "5935c25fb3acc3127c3d8cd9", 70, "USD", 3, false, 20000, 4);
 
         //ar-10 precision armanent m11 7.62x51 muzzle brake
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cdd7693d7f00c0010373aa5", "5935c25fb3acc3127c3d8cd9", 91, "USD", 3, false, 2000);
@@ -837,7 +836,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf6935bd7f00c06585fb791", "5935c25fb3acc3127c3d8cd9", 57, "USD", 3, false, 2000);
 
         //Lantac BMD 7.62x51 Blast Mitigation Device
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf78720d7f00c06595bc93e", "5935c25fb3acc3127c3d8cd9", 96, "USD", 3, false, 5000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf78720d7f00c06595bc93e", "5935c25fb3acc3127c3d8cd9", 96, "USD", 3, false, 5000, 4);
 
         //thunder beast arms 223cb 5.56x45 muzzle brake
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d440625a4b9361eec4ae6c5", "5935c25fb3acc3127c3d8cd9", 70, "USD", 3, false, 2000);
@@ -846,57 +845,57 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d443f8fa4b93678dd4a01aa", "5935c25fb3acc3127c3d8cd9", 71, "USD", 3, false, 2000);
 
         //ferfrans cqb 5.56x45 muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f6372e2865db925d54f3869", "5935c25fb3acc3127c3d8cd9", 82, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f6372e2865db925d54f3869", "5935c25fb3acc3127c3d8cd9", 82, "USD", 3, false, 20000, 5);
 
         //sig sauer 7.62x51 3-prong flash hider
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbcbcf593164a5b6278efb2", "5935c25fb3acc3127c3d8cd9", 18, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbcbcf593164a5b6278efb2", "5935c25fb3acc3127c3d8cd9", 18, "USD", 3, false, 20000, 5);
 
         //sig sauer two port brake 7.62x51 muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbcbd10ab884124df0cd563", "5935c25fb3acc3127c3d8cd9", 57, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbcbd10ab884124df0cd563", "5935c25fb3acc3127c3d8cd9", 57, "USD", 3, false, 20000, 5);
 
         //silencerco asr 51t 5.56x45 flash hider
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "609269c3b0e443224b421cc1", "5935c25fb3acc3127c3d8cd9", 78, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "609269c3b0e443224b421cc1", "5935c25fb3acc3127c3d8cd9", 78, "USD", 3, false, 2000, 3);
 
         //gemtech one direct thread mount adapter
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c7954d52e221600106f4cc7", "5935c25fb3acc3127c3d8cd9", 39, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c7954d52e221600106f4cc7", "5935c25fb3acc3127c3d8cd9", 39, "USD", 3, false, 2000, 5);
 
         //lantac bmd blast mitigation device a3 direct thread adapter
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf78496d7f00c065703d6ca", "5935c25fb3acc3127c3d8cd9", 33, "USD", 3, false, 5000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf78496d7f00c065703d6ca", "5935c25fb3acc3127c3d8cd9", 33, "USD", 3, false, 5000, 4);
 
         //aimpoint comp m4 reflex sight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c7d55de2e221644f31bff68", "5935c25fb3acc3127c3d8cd9", 287, "USD", 3, false, 2000);
 
         //kac qdss nt-4 5.56x45 sound suppressor (black)
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "57da93632459771cb65bf83f", "5935c25fb3acc3127c3d8cd9", 462, "USD", 3, false, 15000);
+        CoreMod.CreateTraderAssort(id, "57da93632459771cb65bf83f", "5935c25fb3acc3127c3d8cd9", 462, "USD", 3, false, 15000, 5);
         CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5a27bb3d86f77411ea361a21"); // cargo x part 2
 
         //silencerCo osprey 9 9x19mm sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a32a064c4a28200741e22de", "5935c25fb3acc3127c3d8cd9", 385, "USD", 3, false, 8000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a32a064c4a28200741e22de", "5935c25fb3acc3127c3d8cd9", 385, "USD", 3, false, 8000,2);
 
         //alpha dog alpha 9 9x19 sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a33a8ebc4a282000c5a950d", "5935c25fb3acc3127c3d8cd9", 249, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a33a8ebc4a282000c5a950d", "5935c25fb3acc3127c3d8cd9", 249, "USD", 3, false, 2000, 3);
 
         //gemtech sfn-57 5.7x28 sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d3ef698a4b9361182109872", "5935c25fb3acc3127c3d8cd9", 367, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d3ef698a4b9361182109872", "5935c25fb3acc3127c3d8cd9", 367, "USD", 3, false, 2000, 2);
 
         //kac prs/qdc 7.62x51 sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfa3d2b0dee1b22f862eade", "5935c25fb3acc3127c3d8cd9", 421, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfa3d2b0dee1b22f862eade", "5935c25fb3acc3127c3d8cd9", 421, "USD", 3, false, 2000, 3);
 
         //SIG Sauer SRD762Ti 7.62x51 sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbe7618d6fa9c00c571bb6c", "5935c25fb3acc3127c3d8cd9", 503, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbe7618d6fa9c00c571bb6c", "5935c25fb3acc3127c3d8cd9", 503, "USD", 3, false, 20000, 2);
 
         //leupold mark 4 hamr 4x24mm deltapoint hybrid assault scope
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "544a3a774bdc2d3a388b4567", "5935c25fb3acc3127c3d8cd9", 415, "USD", 3, false, 15000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "544a3a774bdc2d3a388b4567", "5935c25fb3acc3127c3d8cd9", 415, "USD", 3, false, 15000, 4);
 
         //elcan specterDR 1x/4x scope
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "57ac965c24597706be5f975c", "5935c25fb3acc3127c3d8cd9", 319, "USD", 3, false, 15000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "57ac965c24597706be5f975c", "5935c25fb3acc3127c3d8cd9", 319, "USD", 3, false, 15000, 4);
 
         //trijicon acog 3.5x35 scope
         CoreMod.CreateTraderAssort(HashUtil.generate(), "59db7e1086f77448be30ddf3", "5935c25fb3acc3127c3d8cd9", 227, "USD", 3, false, 15000);
 
         //trijicon srs-02 reflex sight
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d2da1e948f035477b1ce2ba", "5935c25fb3acc3127c3d8cd9", 222, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d2da1e948f035477b1ce2ba", "5935c25fb3acc3127c3d8cd9", 222, "USD", 3, false, 2000, 5);
 
         //AIMPOINT micro t-1 reflex sight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "58d399e486f77442e0016fe7", "5935c25fb3acc3127c3d8cd9", 255, "USD", 3, false, 15000);
@@ -905,7 +904,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfa3d7ac41b2312ea33362a", "5935c25fb3acc3127c3d8cd9", 35, "USD", 3, false, 2000);
 
         //kac folding micro front sight
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfa3d950dee1b22f862eae0", "5935c25fb3acc3127c3d8cd9", 28, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfa3d950dee1b22f862eae0", "5935c25fb3acc3127c3d8cd9", 28, "USD", 3, false, 20000, 8);
 
         //gpnvg-18 night vision goggles
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0558060db834001b735271", "hideout", "hideout", [
@@ -934,7 +933,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "544909bb4bdc2d6f028b4577", "5935c25fb3acc3127c3d8cd9", 186, "USD", 3, false, 15000);
 
         //steiner dbal-pl tactical laser device
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d2369418abbc306c62e0c80", "5935c25fb3acc3127c3d8cd9", 131, "USD", 3, false, 8000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d2369418abbc306c62e0c80", "5935c25fb3acc3127c3d8cd9", 131, "USD", 3, false, 8000, 4);
 
         //mpx geissele sch charging handle
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c5db6b32e221600102611a0", "5935c25fb3acc3127c3d8cd9", 18, "USD", 3, false, 2000);
@@ -952,16 +951,16 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d133067d7ad1a33013f95b4", "5935c25fb3acc3127c3d8cd9", 16, "USD", 3, false, 2000);
 
         //rfb handguard rail mount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f2aa493cd375f14e15eea72", "5935c25fb3acc3127c3d8cd9", 21, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f2aa493cd375f14e15eea72", "5935c25fb3acc3127c3d8cd9", 21, "USD", 3, false, 20000, 6);
 
         //rfb scope mount rail
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f2aa49f9b44de6b1b4e68d4", "5935c25fb3acc3127c3d8cd9", 26, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f2aa49f9b44de6b1b4e68d4", "5935c25fb3acc3127c3d8cd9", 26, "USD", 3, false, 20000, 5);
 
         //mpx retractable stock pipe adapter
         CoreMod.CreateTraderAssort(HashUtil.generate(), "58ac1bf086f77420ed183f9f", "5935c25fb3acc3127c3d8cd9", 32, "USD", 3, false, 2000);
 
         //magpul moe carbine stock series rubber butt-pad
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "58d2912286f7744e27117493", "5935c25fb3acc3127c3d8cd9", 47, "USD", 3, false, 15000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "58d2912286f7744e27117493", "5935c25fb3acc3127c3d8cd9", 47, "USD", 3, false, 15000, 7);
 
         //magpul moe carbine stock (flat dark earth)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "58d2946386f774496974c37e", "5935c25fb3acc3127c3d8cd9", 65, "USD", 3, false, 15000);
@@ -988,7 +987,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b39f8db5acfc40016387a1b", "5935c25fb3acc3127c3d8cd9", 86, "USD", 3, false, 2000);
 
         //sa-58/fal magpul prs 2 polymer stock
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b7d63b75acfc400170e2f8a", "5935c25fb3acc3127c3d8cd9", 157, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b7d63b75acfc400170e2f8a", "5935c25fb3acc3127c3d8cd9", 157, "USD", 3, false, 2000, 5);
 
         //mpx maxim defense cqb telescoping stock
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c5db6ee2e221600113fba54", "5935c25fb3acc3127c3d8cd9", 37, "USD", 3, false, 2000);
@@ -1003,28 +1002,28 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc700cae4a949035e43ba72", "5935c25fb3acc3127c3d8cd9", 22, "USD", 3, false, 2000);
 
         //magpul prs gen3 stock
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d44069ca4b9361ebd26fc37", "5935c25fb3acc3127c3d8cd9", 182, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d44069ca4b9361ebd26fc37", "5935c25fb3acc3127c3d8cd9", 182, "USD", 3, false, 2000, 3);
 
         //kriss defiance ds150 stock (flat dark earth)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fce16961f152d4312622bc9", "5935c25fb3acc3127c3d8cd9", 77, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fce16961f152d4312622bc9", "5935c25fb3acc3127c3d8cd9", 77, "USD", 3, false, 20000, 5);
 
         //AR-15 5.56x45 260mm barrel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "55d35ee94bdc2d61338b4568", "5935c25fb3acc3127c3d8cd9", 185, "USD", 3, false, 15000);
 
         //ar-15 5.56x45 370mm barrel
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d3632e4bdc2d972f8b4569", "5935c25fb3acc3127c3d8cd9", 238, "USD", 3, false, 15000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d3632e4bdc2d972f8b4569", "5935c25fb3acc3127c3d8cd9", 238, "USD", 3, false, 15000, 4);
 
         //mpx 9x19 10.5 inch barrel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c5db5b82e2216003a0fe71d", "5935c25fb3acc3127c3d8cd9", 80, "USD", 3, false, 2000);
 
         //fn five-seven 5.7x28 threaded barrel
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d3eb59ea4b9361c284bb4b2", "5935c25fb3acc3127c3d8cd9", 41, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d3eb59ea4b9361c284bb4b2", "5935c25fb3acc3127c3d8cd9", 41, "USD", 3, false, 2000, 2);
 
         //ak magpul moe akm handguard (stealth gray)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "57cffe20245977632f391a9d", "5935c25fb3acc3127c3d8cd9", 133, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "57cffe20245977632f391a9d", "5935c25fb3acc3127c3d8cd9", 133, "USD", 3, false, 2000, 3);
 
         //sr-25 7.62x51 20 inch barrel
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfa397fb11454561e39246c", "5935c25fb3acc3127c3d8cd9", 390, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfa397fb11454561e39246c", "5935c25fb3acc3127c3d8cd9", 390, "USD", 3, false, 2000, 3);
 
         //ar-15 daniel defense ris II 9.5 handguard
         CoreMod.CreateTraderAssort(HashUtil.generate(), "588b56d02459771481110ae2", "5935c25fb3acc3127c3d8cd9", 142, "USD", 3, false, 15000);
@@ -1051,10 +1050,10 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d010d1cd7ad1a59283b1ce7", "5935c25fb3acc3127c3d8cd9", 140, "USD", 3, false, 2000);
 
         //ar-15 urx 3 8 inch inch handguard
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d123102d7ad1a004e475fe5", "5935c25fb3acc3127c3d8cd9", 162, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d123102d7ad1a004e475fe5", "5935c25fb3acc3127c3d8cd9", 162, "USD", 3, false, 2000, 5);
 
         //ar-15 magpul moe pistol grip (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "55802f5d4bdc2dac148b458f", "5935c25fb3acc3127c3d8cd9", 40, "USD", 3, false, 8000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "55802f5d4bdc2dac148b458f", "5935c25fb3acc3127c3d8cd9", 40, "USD", 3, false, 8000, 4);
 
         //hogue overmolded rubber grip (flat dark earth)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "57af48872459771f0b2ebf11", "5935c25fb3acc3127c3d8cd9", 35, "USD", 3, false, 15000);
@@ -1081,7 +1080,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c6d7b3d2e221600114c9b7d", "5935c25fb3acc3127c3d8cd9", 30, "USD", 3, false, 2000);
 
         //hk 416a5 5.56x45 upper receiver
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bb20d53d4351e4502010a69", "5935c25fb3acc3127c3d8cd9", 63, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bb20d53d4351e4502010a69", "5935c25fb3acc3127c3d8cd9", 63, "USD", 3, false, 2000, 7);
 
         //fn p90 upper receiver
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc70102e4a949035e43ba74", "5935c25fb3acc3127c3d8cd9", 24, "USD", 3, false, 2000);
@@ -1144,7 +1143,7 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5ac4ad3686f774181345c3da", "5935c25fb3acc3127c3d8cd9", 777, "USD", 3, false, 20000);
 
         //knights armament company sr-25 7.62x51 marksman rifle
-        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5e03511086f7744ccb1fb6cf", "5935c25fb3acc3127c3d8cd9", 1025, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5e03511086f7744ccb1fb6cf", "5935c25fb3acc3127c3d8cd9", 1025, "USD", 3, false, 20000, 3);
 
         //fn p90 5.7x28 submachine gun sbr
         CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5d23404b86f7740d62079098", "hideout", "hideout", [
@@ -1171,7 +1170,7 @@ class PeacekeeperAssort
                 "_tpl": "590c651286f7741e566b6461"
             }
             ]
-        ], "5935c25fb3acc3127c3d8cd9", 3, false, 600);
+        ], "5935c25fb3acc3127c3d8cd9", 3, false, 600, 1);
 
         //ops-core fast visor
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a16b672fcdbcb001912fa83", "5935c25fb3acc3127c3d8cd9", 114, "USD", 3, false, 2000);
@@ -1183,16 +1182,16 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a16badafcdbcb001865f72d", "5935c25fb3acc3127c3d8cd9", 334, "USD", 3, false, 2000);
 
         //caiman fixed arm visor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f60bf4558eff926626a60f2", "5935c25fb3acc3127c3d8cd9", 181, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f60bf4558eff926626a60f2", "5935c25fb3acc3127c3d8cd9", 181, "USD", 3, false, 20000, 4);
 
         //Caiman Ballistic Mandible Guard
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f60c076f2bcbb675b00dac2", "5935c25fb3acc3127c3d8cd9", 237, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f60c076f2bcbb675b00dac2", "5935c25fb3acc3127c3d8cd9", 237, "USD", 3, false, 20000, 4);
 
         //ops-core fast mt super high cut helmet (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a154d5cfcdbcb001a3b00da", "5935c25fb3acc3127c3d8cd9", 1267, "USD", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a154d5cfcdbcb001a3b00da", "5935c25fb3acc3127c3d8cd9", 1267, "USD", 3, false, 2000, 2);
 
         //msa ach tc-2002 mich series helmet
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d5e9c74a4b9364855191c40", "5935c25fb3acc3127c3d8cd9", 475, "USD", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d5e9c74a4b9364855191c40", "5935c25fb3acc3127c3d8cd9", 475, "USD", 3, false, 20000, 5);
 
         //team wendy exfil ballistic helmet (black)
         id = HashUtil.generate();
@@ -1204,7 +1203,7 @@ class PeacekeeperAssort
                 "_tpl": "59f32bb586f774757e1e8442"
             }
             ]
-        ], "5935c25fb3acc3127c3d8cd9", 3, false, 200);
+        ], "5935c25fb3acc3127c3d8cd9", 3, false, 200, 1);
         CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5edac020218d181e29451446"); // Samples
 
         //armasight nvg head strap
@@ -1213,22 +1212,22 @@ class PeacekeeperAssort
         //cqc osprey mk4a plate carrier (assault, mtp)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "60a3c70cde5f453f634816a3", "5935c25fb3acc3127c3d8cd9", 1439, "USD", 3, false, 2000, 1);
 
+		// 5.56x45 Magpul PMAG GEN M3 30 STANAG 30-round magazine (Black)
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d1340b3d7ad1a0b52682ed7", "5935c25fb3acc3127c3d8cd9", 30, "USD", 3, false, 20000);
     }
     static GenerateLL4()
     {
         const CoreMod = require("../../CoreMod/src/Core.js");
         let id = null;
 
-        //TODO
         //remington r11 rsass 7.62x51 marksman rifle
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5a3a85af86f774745637d46c", "5935c25fb3acc3127c3d8cd9", 500, "USD", 4, false, 100, 1);
+        CoreMod.CreateTraderAssortWithPreset(id, "5a3a85af86f774745637d46c", "5935c25fb3acc3127c3d8cd9", 1518, "USD", 4, false, 20000, 2);
         CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5a27bc6986f7741c7358402b"); // wet job part 5
 
-        //TODO
         //AFAK personal tactical first aid kit
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "60098ad7c2240c0fe85c570a", "5935c25fb3acc3127c3d8cd9", 25, "USD", 4, false, 2000, 5);
+        CoreMod.CreateTraderAssort(id, "60098ad7c2240c0fe85c570a", "5935c25fb3acc3127c3d8cd9", 309, "USD", 4, false, 20000, 2);
         CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5a27bc6986f7741c7358402b"); // wet job part 5
 
         //TODO
@@ -1251,47 +1250,47 @@ class PeacekeeperAssort
 
         //Multi-hit ballistic face shield-visor for Ops-Core FAST helmet
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "5a16b672fcdbcb001912fa83", "5935c25fb3acc3127c3d8cd9", 346, "USD", 4, false, 2000, 1);
+        CoreMod.CreateTraderAssort(id, "5a16b672fcdbcb001912fa83", "5935c25fb3acc3127c3d8cd9", 114, "USD", 4, false, 2000);
         CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5edac020218d181e29451446"); // Samples
 
         //5.56x45mm m855a1
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "54527ac44bdc2d36668b4567", "5935c25fb3acc3127c3d8cd9", 7, "USD", 4, false, 1000000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "54527ac44bdc2d36668b4567", "5935c25fb3acc3127c3d8cd9", 7, "USD", 4, false, 1000000, 120);
 
         //40X46MM M381(HE) GRENADE
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ede474b0c226a66f5402622", "5935c25fb3acc3127c3d8cd9", 315, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ede474b0c226a66f5402622", "5935c25fb3acc3127c3d8cd9", 315, "USD", 4, false, 2000, 1);
 
         //.338 lapua magnum fmj
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc275cf85fd526b824a571a", "5935c25fb3acc3127c3d8cd9", 17, "USD", 4, false, 40000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc275cf85fd526b824a571a", "5935c25fb3acc3127c3d8cd9", 17, "USD", 4, false, 40000, 20);
 
         //7.62x51 magpul pmag sr-lr gen m3 20 20-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a3501acc4a282000d72293a", "5935c25fb3acc3127c3d8cd9", 35, "USD", 4, false, 7000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a3501acc4a282000d72293a", "5935c25fb3acc3127c3d8cd9", 35, "USD", 4, false, 7000, 10);
 
         //14 7.62x51 30-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5addcce35acfc4001a5fc635", "5935c25fb3acc3127c3d8cd9", 57, "USD", 4, false, 4000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5addcce35acfc4001a5fc635", "5935c25fb3acc3127c3d8cd9", 57, "USD", 4, false, 4000, 12);
 
         //sa-58/fal 7.62x51 british 30-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b7d37845acfc400170e2f87", "5935c25fb3acc3127c3d8cd9", 45, "USD", 4, false, 5000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b7d37845acfc400170e2f87", "5935c25fb3acc3127c3d8cd9", 45, "USD", 4, false, 5000, 7);
 
         //ak 7.62x39 promag ak-a-16 73-round drum magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c6175362e221600133e3b94", "5935c25fb3acc3127c3d8cd9", 403, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c6175362e221600133e3b94", "5935c25fb3acc3127c3d8cd9", 403, "USD", 4, false, 2000, 2);
 
         //fortis shift tactical grip
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "59f8a37386f7747af3328f06", "5935c25fb3acc3127c3d8cd9", 157, "USD", 4, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59f8a37386f7747af3328f06", "5935c25fb3acc3127c3d8cd9", 157, "USD", 4, false, 20000, 4);
 
         //pws cqb 5.56x45 muzzle brake
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5943ee5a86f77413872d25ec", "5935c25fb3acc3127c3d8cd9", 97, "USD", 4, false, 15000);
 
         //aac blackout 51t 7.62x51 flash hider
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a34fd2bc4a282329a73b4c5", "5935c25fb3acc3127c3d8cd9", 42, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a34fd2bc4a282329a73b4c5", "5935c25fb3acc3127c3d8cd9", 42, "USD", 4, false, 2000, 5);
 
         //lantac dragon 7.62x51 muzzle brake
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c878e9d2e2216000f201903", "5935c25fb3acc3127c3d8cd9", 163, "USD", 4, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c878e9d2e2216000f201903", "5935c25fb3acc3127c3d8cd9", 163, "USD", 4, false, 20000, 4);
 
         //ar-10 keeno arms shrewd 7.62x51 muzzle brake
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cdd7685d7f00c000f260ed2", "5935c25fb3acc3127c3d8cd9", 117, "USD", 4, false, 2000);
 
         //ferfrans crd concussion reduction device 5.56x45
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f6339d53ada5942720e2dc3", "5935c25fb3acc3127c3d8cd9", 94, "USD", 4, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f6339d53ada5942720e2dc3", "5935c25fb3acc3127c3d8cd9", 94, "USD", 4, false, 20000, 5);
 
         //Trijicon ACOG backup rear sight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c05295e0db834001a66acbb", "5935c25fb3acc3127c3d8cd9", 24, "USD", 4, false, 2000);
@@ -1303,10 +1302,10 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c7955c22e221644f31bfd5e", "5935c25fb3acc3127c3d8cd9", 470, "USD", 4, false, 2000);
 
         //SIG Sauer SRD762-QD 7.62x51 sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbe760793164a5b6278efc8", "5935c25fb3acc3127c3d8cd9", 520, "USD", 4, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbe760793164a5b6278efc8", "5935c25fb3acc3127c3d8cd9", 520, "USD", 4, false, 20000, 3);
 
         //silencerco saker asr 556 5.56x45 sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "60926df0132d4d12c81fd9df", "5935c25fb3acc3127c3d8cd9", 603, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "60926df0132d4d12c81fd9df", "5935c25fb3acc3127c3d8cd9", 603, "USD", 4, false, 2000, 3);
 
         //elcan specterdr 1x/4x scope (flat dark earth)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "57aca93d2459771f2c7e26db", "5935c25fb3acc3127c3d8cd9", 312, "USD", 4, false, 15000);
@@ -1318,24 +1317,24 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c05293e0db83400232fff80", "5935c25fb3acc3127c3d8cd9", 268, "USD", 4, false, 2000);
 
         //Trijicon acog ta01nsn 4x32 scope (tan)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c052a900db834001a66acbd", "5935c25fb3acc3127c3d8cd9", 260, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c052a900db834001a66acbd", "5935c25fb3acc3127c3d8cd9", 260, "USD", 4, false, 2000, 4);
 
         //eotech hhs-1 hybrid sight
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "5c07dd120db834001c39092d", "5935c25fb3acc3127c3d8cd9", 496, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(id, "5c07dd120db834001c39092d", "5935c25fb3acc3127c3d8cd9", 496, "USD", 4, false, 2000, 5);
         CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5c0d4e61d09282029f53920e"); // the guide
 
         //gpnvg-18 night vision goggles
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0558060db834001b735271", "5935c25fb3acc3127c3d8cd9", 1613, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0558060db834001b735271", "5935c25fb3acc3127c3d8cd9", 1613, "USD", 4, false, 2000, 1);
 
         //Badger Ordnance Tactical Charging Handle Latch
         CoreMod.CreateTraderAssort(HashUtil.generate(), "56ea7165d2720b6e518b4583", "5935c25fb3acc3127c3d8cd9", 43, "USD", 4, false, 15000);
 
         //ar-15 avalanche mod2 charging handle
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f633ff5c444ce7e3c30a006", "5935c25fb3acc3127c3d8cd9", 68, "USD", 4, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f633ff5c444ce7e3c30a006", "5935c25fb3acc3127c3d8cd9", 68, "USD", 4, false, 20000, 5);
 
         //trijicon ta51 sight mount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "59db7eed86f77461f8380365", "5935c25fb3acc3127c3d8cd9", 42, "USD", 4, false, 15000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59db7eed86f77461f8380365", "5935c25fb3acc3127c3d8cd9", 42, "USD", 4, false, 15000, 4);
 
         //Remington M700 AB Arms MOD*X rail mount
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cde7b43d7f00c000d36b93e", "5935c25fb3acc3127c3d8cd9", 26, "USD", 4, false, 2000);
@@ -1344,19 +1343,19 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a33cae9c4a28232980eb086", "5935c25fb3acc3127c3d8cd9", 166, "USD", 4, false, 2000);
 
         //akm/ak-74 magpul zhukov-s stock
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b0e794b5acfc47a877359b2", "5935c25fb3acc3127c3d8cd9", 180, "USD", 4, false, 7000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b0e794b5acfc47a877359b2", "5935c25fb3acc3127c3d8cd9", 180, "USD", 4, false, 7000, 5);
 
         //remington m700 ab arms buffer tube side folder adapter
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cde77a9d7f00c000f261009", "5935c25fb3acc3127c3d8cd9", 26, "USD", 4, false, 2000);
 
         //hk e1 stock
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c87a07c2e2216001219d4a2", "5935c25fb3acc3127c3d8cd9", 107, "USD", 4, false, 7000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c87a07c2e2216001219d4a2", "5935c25fb3acc3127c3d8cd9", 107, "USD", 4, false, 7000, 4);
 
         //remington m700 ab arms mod*x gen 3 stock
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cde739cd7f00c0010373bd3", "5935c25fb3acc3127c3d8cd9", 145, "USD", 4, false, 2000);
 
         //b5 systems precision stock
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc2369685fd526b824a5713", "5935c25fb3acc3127c3d8cd9", 179, "USD", 4, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fc2369685fd526b824a5713", "5935c25fb3acc3127c3d8cd9", 179, "USD", 4, false, 20000, 4);
 
         //ar-10 7.62x51 18 inch barrel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a34f7f1c4a2826c6e06d75d", "5935c25fb3acc3127c3d8cd9", 379, "USD", 4, false, 2000);
@@ -1371,16 +1370,16 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "55f84c3c4bdc2d5f408b4576", "5935c25fb3acc3127c3d8cd9", 145, "USD", 4, false, 15000);
 
         //ar-15 5.56x45 20 inch barrel
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d440b9fa4b93601354d480c", "5935c25fb3acc3127c3d8cd9", 354, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d440b9fa4b93601354d480c", "5935c25fb3acc3127c3d8cd9", 354, "USD", 4, false, 2000, 3);
 
         //sr-25 7.62x51 16 inch barrel
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5df917564a9f347bc92edca3", "5935c25fb3acc3127c3d8cd9", 295, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5df917564a9f347bc92edca3", "5935c25fb3acc3127c3d8cd9", 295, "USD", 4, false, 2000, 3);
 
         //AR-15 War Sport LVOA-C handguard (Black)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "595cfa8b86f77427437e845b", "5935c25fb3acc3127c3d8cd9", 194, "USD", 4, false, 15000);
 
         //ak krebs custom ufm keymod handguard
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "59fb375986f7741b681b81a6", "5935c25fb3acc3127c3d8cd9", 217, "USD", 4, false, 3000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59fb375986f7741b681b81a6", "5935c25fb3acc3127c3d8cd9", 217, "USD", 4, false, 3000, 3);
 
         //hk 416a5 midwest industries 13.5 inch m-lok handguard
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c6d11072e2216000e69d2e4", "5935c25fb3acc3127c3d8cd9", 140, "USD", 4, false, 2000);
@@ -1395,10 +1394,10 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d122e7bd7ad1a07102d6d7f", "5935c25fb3acc3127c3d8cd9", 182, "USD", 4, false, 2000);
 
         //ar-10 lancer lch-7 12.5 inch m-lok handguard
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f6336bbda967c74a42e9932", "5935c25fb3acc3127c3d8cd9", 205, "USD", 4, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f6336bbda967c74a42e9932", "5935c25fb3acc3127c3d8cd9", 205, "USD", 4, false, 20000, 5);
 
         //ar-15 naroh arms gral-s pistol grip
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "59db3a1d86f77429e05b4e92", "5935c25fb3acc3127c3d8cd9", 134, "USD", 4, false, 15000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59db3a1d86f77429e05b4e92", "5935c25fb3acc3127c3d8cd9", 134, "USD", 4, false, 15000, 5);
 
         //ar-15 stark ar rifle grip (black)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "59db3acc86f7742a2c4ab912", "5935c25fb3acc3127c3d8cd9", 45, "USD", 4, false, 15000);
@@ -1463,22 +1462,47 @@ class PeacekeeperAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c1793902e221602b21d3de2", "5935c25fb3acc3127c3d8cd9", 350, "USD", 4, false, 2000);
 
         //tw exfil ballistic helmet face shield (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e00cdd986f7747473332240", "5935c25fb3acc3127c3d8cd9", 305, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e00cdd986f7747473332240", "5935c25fb3acc3127c3d8cd9", 305, "USD", 4, false, 2000, 2);
 
         //tw exfil ear covers (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e00cfa786f77469dc6e5685", "5935c25fb3acc3127c3d8cd9", 382, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e00cfa786f77469dc6e5685", "5935c25fb3acc3127c3d8cd9", 382, "USD", 4, false, 2000, 2);
 
         //tw exfil ear covers (coyote tan)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e01f31d86f77465cf261343", "5935c25fb3acc3127c3d8cd9", 380, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e01f31d86f77465cf261343", "5935c25fb3acc3127c3d8cd9", 380, "USD", 4, false, 2000, 2);
 
         //tw exfil ballistic helmet face shield (coyote tan)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e01f37686f774773c6f6c15", "5935c25fb3acc3127c3d8cd9", 305, "USD", 4, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e01f37686f774773c6f6c15", "5935c25fb3acc3127c3d8cd9", 305, "USD", 4, false, 2000, 2);
 
         //caiman hybrid ballistic applique (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f60b85bbdb8e27dee3dc985", "5935c25fb3acc3127c3d8cd9", 584, "USD", 4, false, 3000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f60b85bbdb8e27dee3dc985", "5935c25fb3acc3127c3d8cd9", 584, "USD", 4, false, 3000, 3);
 
         //3V G Paratus 3-Day Operator's Tactical backpack
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e805e86f774683f3dd637", "5935c25fb3acc3127c3d8cd9", 563, "USD", 4, false, 2000);
+		
+		//Crye Precision AirFrame helmet (Tan)
+		id = HashUtil.generate();
+        CoreMod.CreateTraderAssort(id, "5c17a7ed2e2216152142459c", "5935c25fb3acc3127c3d8cd9", 1299, "USD", 4, false, 6000, 2);
+		CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5c0d0f1886f77457b8210226"); // lend lease part 2
+		
+		// Ops-Core FAST multi-hit ballistic face shield
+		id = HashUtil.generate();
+        CoreMod.CreateTraderAssort(id, "5a16b7e1fcdbcb00165aa6c9", "5935c25fb3acc3127c3d8cd9", 351, "USD", 4, false, 8000, 4);
+		CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5edac020218d181e29451446"); // Samples
+		
+		// Team Wendy EXFIL Ballistic Helmet (Coyote Tan)
+		id = HashUtil.generate();
+        CoreMod.CreateTraderAssort(id, "5e01ef6886f77445f643baa4", "5935c25fb3acc3127c3d8cd9", 1279, "USD", 4, false, 2000, 2);
+		CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5edac020218d181e29451446"); // Samples
+		
+		// Mesa Tactical Crosshair Hydraulic buffer tube
+		id = HashUtil.generate();
+        CoreMod.CreateTraderAssort(id, "5ef1ba28c64c5d0dfc0571a5", "5935c25fb3acc3127c3d8cd9", 208, "USD", 4, false, 2000, 3);
+		CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5edac63b930f5454f51e128b"); // TerraGroup employee
+		
+		// CQC Osprey MK4A plate carrier (Protection, MTP)
+		id = HashUtil.generate();
+        CoreMod.CreateTraderAssort(id, "60a3c68c37ea821725773ef5", "5935c25fb3acc3127c3d8cd9", 1511, "USD", 4, false, 2000, 1);
+		CoreMod.CreateTraderAssortUnlock("5935c25fb3acc3127c3d8cd9", "success", id, "5c0d4c12d09282029f539173"); // Peacekeeping mission
     }
     static generatePeacekeeperAssort()
     {
diff --git a/Ereshkigal-BaseAssortGenerator/src/prapor.js b/Ereshkigal-BaseAssortGenerator/src/prapor.js
index e97b2ca..591b4bc 100644
--- a/Ereshkigal-BaseAssortGenerator/src/prapor.js
+++ b/Ereshkigal-BaseAssortGenerator/src/prapor.js
@@ -39,7 +39,7 @@ class PraporAssort {
 
         //5.45x39mm PS gs
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssort(id, "56dff3afd2720bba668b4567", "54cb50c76803fa8b248b4571", 81, "RUB", 1, true, 999999);
+        CoreMod.CreateTraderAssort(id, "56dff3afd2720bba668b4567", "54cb50c76803fa8b248b4571", 93, "RUB", 1, true, 999999);
         CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "59674eb386f774539f14813a") // delivery from the past
 
         //5.45x39mm PRS GS
@@ -79,7 +79,7 @@ class PraporAssort {
         CoreMod.CreateTraderAssort(HashUtil.generate(), "58864a4f2459770fcc257101", "54cb50c76803fa8b248b4571", 54, "RUB", 1, true, 999999);
 
         //7.62x54R LPS
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5887431f2459777e1612938f", "54cb50c76803fa8b248b4571", 460, "RUB", 1, true, 999999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5887431f2459777e1612938f", "54cb50c76803fa8b248b4571", 319, "RUB", 1, true, 999999);
 
         //F-1 Hand grenade
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5710c24ad2720bc3458b45a3", "hideout", "hideout", [
@@ -90,7 +90,7 @@ class PraporAssort {
         ], "54cb50c76803fa8b248b4571", 1, false, 5000, 3);
 
         //RDG Smoke
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a2a57cfc4a2826c6e06d44a", "54cb50c76803fa8b248b4571", 5931, "RUB", 1, false, 50000, 4);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a2a57cfc4a2826c6e06d44a", "54cb50c76803fa8b248b4571", 4745, "RUB", 1, false, 50000, 4);
 
         //PM 9X18PM 90-93 8-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5448c12b4bdc2d02308b456f", "54cb50c76803fa8b248b4571", 1025, "RUB", 1, true, 999999);
@@ -703,7 +703,7 @@ class PraporAssort {
 		
         //Mosin bolt action rifle
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5b8683a486f77467f2423114", "54cb50c76803fa8b248b4571", 56271, "RUB", 2, false, 20000);
+        CoreMod.CreateTraderAssortWithPreset(id, "5b8683a486f77467f2423114", "54cb50c76803fa8b248b4571", 42203, "RUB", 2, false, 20000);
 		
 		//MPL-50 Entrenching tool
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5bead2e00db834001c062938", "hideout", "hideout", [
@@ -833,10 +833,10 @@ class PraporAssort {
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5f647f31b6238e5dd066e196", "54cb50c76803fa8b248b4571", 105, "RUB", 3, false, 300000, 80);
 
         //rgd-5 hand grenade
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5448be9a4bdc2dfd2f8b456a", "54cb50c76803fa8b248b4571", 9851, "RUB", 3, false, 520000, 4);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5448be9a4bdc2dfd2f8b456a", "54cb50c76803fa8b248b4571", 11822, "RUB", 3, false, 520000, 4);
 
         //f-1 hand grenade
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5710c24ad2720bc3458b45a3", "54cb50c76803fa8b248b4571", 7630, "RUB", 3, true, 999999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5710c24ad2720bc3458b45a3", "54cb50c76803fa8b248b4571", 9156, "RUB", 3, true, 999999);
 
         //ak-74 5.45x39 6l26 45-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "55d481904bdc2d8c2f8b456a", "54cb50c76803fa8b248b4571", 4104, "RUB", 3, false, 2000);
@@ -995,7 +995,7 @@ class PraporAssort {
         CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "584147982459775a6c55e931", "54cb50c76803fa8b248b4571", 75045, "RUB", 3, false, 15000);
 
         //pb 9x18pm silenced pistol
-        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "584149452459775992479702", "54cb50c76803fa8b248b4571", 25255, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "584149452459775992479702", "54cb50c76803fa8b248b4571", 21467, "RUB", 3, false, 2000);
 
         //akmn 7.62x39 assault rifle
         CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5a325c3686f7744273716c5b", "54cb50c76803fa8b248b4571", 48193, "RUB", 3, false, 2000);
@@ -1065,7 +1065,7 @@ class PraporAssort {
 
         //sv-98 7.62x54r bolt-action sniper rifle
         id = HashUtil.generate()
-        CoreMod.CreateTraderAssortWithPreset(id, "58414a16245977599247970a", "54cb50c76803fa8b248b4571", 35204, "RUB", 3, true, 999999, 4);
+        CoreMod.CreateTraderAssortWithPreset(id, "58414a16245977599247970a", "54cb50c76803fa8b248b4571", 45558, "RUB", 3, true, 999999, 4);
         CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "59c50a9e86f7745fef66f4ff"); //The punisher p1
 
         //bnti korund-vm armor
diff --git a/Ereshkigal-BaseAssortGenerator/src/ragman.js b/Ereshkigal-BaseAssortGenerator/src/ragman.js
index e096c2d..60ad57b 100644
--- a/Ereshkigal-BaseAssortGenerator/src/ragman.js
+++ b/Ereshkigal-BaseAssortGenerator/src/ragman.js
@@ -17,22 +17,22 @@ class RagmanAssort
         //                               ASSORT ID            ITEM TEMPLATE               TRADER ID             PRICE   CURRENCY   LOYALTY   UNLIMITED      STOCK   MAXIMUM BUY
 
         //armband white
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3f16c486f7747c327f55f7", "5ac3b934156ae10c4430e83c", 810, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3f16c486f7747c327f55f7", "5ac3b934156ae10c4430e83c", 810, "RUB", 1, true, 999999);
 
         //armband red
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3f3ade86f7746b6b790d8e", "5ac3b934156ae10c4430e83c", 993, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3f3ade86f7746b6b790d8e", "5ac3b934156ae10c4430e83c", 993, "RUB", 1, true, 999999);
 
         //armband blue
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3f3af486f774679e752c1f", "5ac3b934156ae10c4430e83c", 637, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3f3af486f774679e752c1f", "5ac3b934156ae10c4430e83c", 637, "RUB", 1, true, 999999);
 
         //armband green
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3f3b0186f774021a2afef7", "5ac3b934156ae10c4430e83c", 585, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3f3b0186f774021a2afef7", "5ac3b934156ae10c4430e83c", 585, "RUB", 1, true, 999999);
 
         //armband yellow
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3f3b0e86f7746752107cda", "5ac3b934156ae10c4430e83c", 593, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3f3b0e86f7746752107cda", "5ac3b934156ae10c4430e83c", 593, "RUB", 1, true, 999999);
 
         //balaclava
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "572b7f1624597762ae139822", "5ac3b934156ae10c4430e83c", 2874, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "572b7f1624597762ae139822", "5ac3b934156ae10c4430e83c", 2874, "RUB", 1, true, 999999);
 
         //kolpak-1s visor
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5ac4c50d5acfc40019262e87", "hideout", "hideout", [[{
@@ -75,10 +75,10 @@ class RagmanAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c06c6a80db834001b735491", "5ac3b934156ae10c4430e83c", 22456, "RUB", 1, true, 999999, 6);
 
         //bear baseball cap (black
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b40e5e25acfc4001a599bea", "5ac3b934156ae10c4430e83c", 2028, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b40e5e25acfc4001a599bea", "5ac3b934156ae10c4430e83c", 2028, "RUB", 1, true, 999999);
 
         //usec baseball cap (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b40e61f5acfc4001a599bec", "5ac3b934156ae10c4430e83c", 1923, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b40e61f5acfc4001a599bec", "5ac3b934156ae10c4430e83c", 1923, "RUB", 1, true, 999999);
 
         //gssh-01 active headset
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5b432b965acfc47a8774094e", "hideout", "hideout", [[{
@@ -88,7 +88,7 @@ class RagmanAssort
         ]], "5ac3b934156ae10c4430e83c", 1, false, 2000);
 
         //6b5-16-zh-86 "uley" armored rig
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e3eb886f7742015526062", "5ac3b934156ae10c4430e83c", 49751, "RUB", 1, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e3eb886f7742015526062", "5ac3b934156ae10c4430e83c", 49751, "RUB", 1, false, 2000, 1);
 
         //spiritus systems bank robber chest rig
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5e4abc1f86f774069619fbaa", "5ac3b934156ae10c4430e83c", 10013, "RUB", 1, true, 999999, 4);
@@ -138,10 +138,10 @@ class RagmanAssort
         const CoreMod = require("../../CoreMod/src/Core.js");
 		let id = null;
         //cold fear infrared balaclava
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ab8f39486f7745cd93a1cca", "5ac3b934156ae10c4430e83c", 4793, "RUB", 2, false, 5000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ab8f39486f7745cd93a1cca", "5ac3b934156ae10c4430e83c", 4793, "RUB", 2, false, 10000, 5);
 
         //shemagh (tan)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b4325355acfc40019478126", "5ac3b934156ae10c4430e83c", 4485, "RUB", 2, false, 5000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b4325355acfc40019478126", "5ac3b934156ae10c4430e83c", 4485, "RUB", 2, false, 5000000, 7);
 
         //ops-core fast visor
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a16b672fcdbcb001912fa83", "5ac3b934156ae10c4430e83c", 12985, "RUB", 2, false, 2000);
@@ -154,7 +154,7 @@ class RagmanAssort
         ]], "5ac3b934156ae10c4430e83c", 2, true, 2000);
 
         //kiver face shield
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b46238386f7741a693bcf9c", "5ac3b934156ae10c4430e83c", 27828, "RUB", 2, false, 8000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b46238386f7741a693bcf9c", "5ac3b934156ae10c4430e83c", 27828, "RUB", 2, false, 8000, 4);
 
         //crossbow tactical glasses
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d5fca1ea4b93635fd598c07", "5ac3b934156ae10c4430e83c", 3885, "RUB", 2, false, 20000);
@@ -163,7 +163,7 @@ class RagmanAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5645bc214bdc2d363b8b4571", "5ac3b934156ae10c4430e83c", 34548, "RUB", 2, false, 35000);
 
         //wilcox skull lock head mount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a16bb52fcdbcb001a3b00dc", "5ac3b934156ae10c4430e83c", 16859, "RUB", 2, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a16bb52fcdbcb001a3b00dc", "5ac3b934156ae10c4430e83c", 16859, "RUB", 2, false, 2000, 4);
 
         //tactical fleece hat
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa2ba19e5b5b00014028f4e", "5ac3b934156ae10c4430e83c", 5007, "RUB", 2, true);
@@ -179,7 +179,7 @@ class RagmanAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa2ba46e5b5b000137b758d", "5ac3b934156ae10c4430e83c", 2268, "RUB", 2, false, 20000);
 
         //Beret (Olive)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f60e784f2bcbb675b00dac7", "5ac3b934156ae10c4430e83c", 13517, "RUB", 2, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f60e784f2bcbb675b00dac7", "5ac3b934156ae10c4430e83c", 13517, "RUB", 2, false, 20000, 5);
 
         //6B47 Ratnik-BSh helmet with cover (Digital Flora)
         //CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7cfc0e5b5b00015693143", "hideout", "hideout", [[{
@@ -192,10 +192,10 @@ class RagmanAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b43271c5acfc432ff4dce65", "5ac3b934156ae10c4430e83c", 2215, "RUB", 2, false, 2000);
 
         //sssh-95 sfera-s helmet
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa7d193e5b5b000171d063f", "5ac3b934156ae10c4430e83c", 71237, "RUB", 2, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa7d193e5b5b000171d063f", "5ac3b934156ae10c4430e83c", 71237, "RUB", 2, false, 2000, 3);
 
         //zsh-1-2m helmet (green)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa7e454e5b5b0214e506fa2", "5ac3b934156ae10c4430e83c", 64479, "RUB", 2, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa7e454e5b5b0214e506fa2", "5ac3b934156ae10c4430e83c", 64479, "RUB", 2, false, 2000, 4);
 
         // untar helmet
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7d03ae5b5b00016327db5", "hideout", "hideout", [[{
@@ -208,10 +208,10 @@ class RagmanAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "60b52e5bc7d8103275739d67", "5ac3b934156ae10c4430e83c", 3519, "RUB", 2, true);
 
         //highcom striker achhc IIIA helmet (olive)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b40e4035acfc47a87740943", "5ac3b934156ae10c4430e83c", 62446, "RUB", 2, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b40e4035acfc47a87740943", "5ac3b934156ae10c4430e83c", 62446, "RUB", 2, false, 2000, 4);
 
         //lzsh light helmet
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b432d215acfc4771e1c6624", "5ac3b934156ae10c4430e83c", 55203, "RUB", 2, false, 5000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b432d215acfc4771e1c6624", "5ac3b934156ae10c4430e83c", 55203, "RUB", 2, false, 5000, 4);
 
         //Peltor comtac 2 headset
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5645bcc04bdc2d363b8b4572", "5ac3b934156ae10c4430e83c", 28917, "RUB", 2, false, 60000, 5);
@@ -240,7 +240,7 @@ class RagmanAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b44d22286f774172b0c9de8", "5ac3b934156ae10c4430e83c", 64553, "RUB", 2, false, 2000);
 
         //6b13 assault armor (flora)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e51be86f774598e797894", "5ac3b934156ae10c4430e83c", 67821, "RUB", 2, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e51be86f774598e797894", "5ac3b934156ae10c4430e83c", 67821, "RUB", 2, false, 2000, 2);
 
         //6b23-1 body armor (digital flora)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e5bab86f77461f55ed1f3", "5ac3b934156ae10c4430e83c", 49207, "RUB", 2, false, 5000, 3);
@@ -253,7 +253,7 @@ class RagmanAssort
             "count": 2,
             "_tpl": "5b3b713c5acfc4330140bd8d"
         }
-        ]], "5ac3b934156ae10c4430e83c", 2, true, 2000, 1);
+        ]], "5ac3b934156ae10c4430e83c", 2, true, 999999, 1);
 
         //umtbs 6sh112 scout-sniper
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5929a2a086f7744f4b234d43", "5ac3b934156ae10c4430e83c", 23780, "RUB", 2, false, 6000, 6);
@@ -272,27 +272,17 @@ class RagmanAssort
         ]], "5ac3b934156ae10c4430e83c", 2, false, 200, 1);
 
         //Blackhawk! Commando Chest Harness (Coyote Tan)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b44c8ea86f7742d1627baf1", "5ac3b934156ae10c4430e83c", 37373, "RUB", 2, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b44c8ea86f7742d1627baf1", "5ac3b934156ae10c4430e83c", 37373, "RUB", 2, false, 2000, 5);
 
         //Dynaforce Triton M43-A chest harness
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5ca20abf86f77418567a43f2", "5ac3b934156ae10c4430e83c", 29301, "RUB", 2, false, 20000);
 
-        //6B5-15 Zh-86 "Uley" armored rig
-        CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e446786f7742013381639", "hideout", "hideout", [[{
-            "count": 3,
-            "_tpl": "5c13cd2486f774072c757944"
-        }, {
-            "count": 4,
-            "_tpl": "5c13cef886f774072e618e82"
-        }
-        ]], "5ac3b934156ae10c4430e83c", 2, false, 15000, 1);
-
         //6B5-15 Zh-86 "Uley" armored rig
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e446786f7742013381639", "hideout", "hideout", [[{
             "count": 3,
             "_tpl": "5c0e446786f7742013381639"
         }
-        ]], "5ac3b934156ae10c4430e83c", 2, false, 15000, 1);
+        ]], "5ac3b934156ae10c4430e83c", 2, false, 2000, 2);
 
         //6B3TM-01M armored rig
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d5d646386f7742797261fd9", "5ac3b934156ae10c4430e83c", 50283, "RUB", 2, false, 15000, 2);
@@ -308,13 +298,43 @@ class RagmanAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d5d85c586f774279a21cbdb", "5ac3b934156ae10c4430e83c", 35076, "RUB", 2, false, 20000, 4);
 
         //azimut ss zhuk chest harness (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "603648ff5a45383c122086ac", "5ac3b934156ae10c4430e83c", 39371, "RUB", 2, false, 12000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "603648ff5a45383c122086ac", "5ac3b934156ae10c4430e83c", 39371, "RUB", 2, false, 12000, 3);
 
         //Gear Craft GC-BSS-MK1 chest rig
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fd4c60f875c30179f5d04c2", "5ac3b934156ae10c4430e83c", 35538, "RUB", 2, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fd4c60f875c30179f5d04c2", "5ac3b934156ae10c4430e83c", 35538, "RUB", 2, false, 200000, 5);
 
         //Stich Profi Chest Rig MK2 (Recon, A-TACS FG)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "60a6220e953894617404b00a", "5ac3b934156ae10c4430e83c", 39960, "RUB", 2, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "60a6220e953894617404b00a", "5ac3b934156ae10c4430e83c", 39960, "RUB", 2, false, 4000, 3);
+		
+		//Eberlestock F5 Switchblade backpack (Dry Earth)
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f5e467b0bc58666c37e7821", "5ac3b934156ae10c4430e83c", 46754, "RUB", 2, false, 20000, 3);
+		
+		//Hazard4 Pillbox backpack
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "60a2828e8689911a226117f9", "5ac3b934156ae10c4430e83c", 24420, "RUB", 2, false, 5000, 4);
+		
+		//Camelbak Tri-Zip backpack
+		CoreMod.CreateTraderBarter(HashUtil.generate(), "545cdae64bdc2d39198b4568", "hideout", "hideout", [[{
+            "count": 4,
+            "_tpl": "590a3cd386f77436f20848cb"
+        }
+        ]], "5ac3b934156ae10c4430e83c", 2, false, 15000, 2);
+		
+		// 6B47 Ratnik-BSh helmet with cover (Digital Flora)
+		CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7cfc0e5b5b00015693143", "hideout", "hideout", [[{
+            "count": 7,
+			"level": 10,
+			"side": "any",
+            "_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()
     {
@@ -322,10 +342,10 @@ class RagmanAssort
 		let id = null;
 
         //shemagh (green)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ab8f85d86f7745cd93a1cf5", "5ac3b934156ae10c4430e83c", 4727, "RUB", 3, true, 999999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ab8f85d86f7745cd93a1cf5", "5ac3b934156ae10c4430e83c", 4727, "RUB", 3, true, 999999, 10);
 
         //momex balaclava
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b432f3d5acfc4704b4a1dfb", "5ac3b934156ae10c4430e83c", 3565, "RUB", 3, true, 999999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b432f3d5acfc4704b4a1dfb", "5ac3b934156ae10c4430e83c", 3565, "RUB", 3, true, 999999, 10);
 
         //altyn face shield
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7e373e5b5b000137b76f0", "hideout", "hideout", [[{
@@ -335,20 +355,20 @@ class RagmanAssort
         ]], "5ac3b934156ae10c4430e83c", 3, false, 200);
 
         //zsh-1-2m face shield
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa7e3abe5b5b000171d064d", "5ac3b934156ae10c4430e83c", 19260, "RUB", 3, false, 2000, 3);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa7e3abe5b5b000171d064d", "5ac3b934156ae10c4430e83c", 19260, "RUB", 3, false, 2000);
 
         //LShZ-2DTM face shield
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5d6d3829a4b9361bc8618943", "hideout", "hideout", [[{
             "count": 3,
             "_tpl": "59e366c186f7741778269d85"
         }
-        ]], "5ac3b934156ae10c4430e83c", 3, false, 20000);
+        ]], "5ac3b934156ae10c4430e83c", 3, false, 20000, 3);
 
         //lshz-2dtm cover
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6d3943a4b9360dbc46d0cc", "5ac3b934156ae10c4430e83c", 1665, "RUB", 3, false, 2000);
 
         //beret (black)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f60e6403b85f6263c14558c", "5ac3b934156ae10c4430e83c", 18315, "RUB", 3, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f60e6403b85f6263c14558c", "5ac3b934156ae10c4430e83c", 18315, "RUB", 3, false, 20000, 5);
 
         //pyramex proximity safety glasses
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0d32fcd174af02a1659c75", "5ac3b934156ae10c4430e83c", 3552, "RUB", 3, false, 2000);
@@ -364,7 +384,7 @@ class RagmanAssort
         ]], "5ac3b934156ae10c4430e83c", 3, false, 2000, 3);
 
         //ops-core fast mt super high cut helmet (tan)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ac8d6885acfc400180ae7b0", "5ac3b934156ae10c4430e83c", 148092, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ac8d6885acfc400180ae7b0", "5ac3b934156ae10c4430e83c", 148092, "RUB", 3, false, 2000, 1);
 
         //highcom striker achhc IIIA helmet (black)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b40e3f35acfc40016388218", "5ac3b934156ae10c4430e83c", 61239, "RUB", 3, false, 2000);
@@ -390,13 +410,13 @@ class RagmanAssort
             "count": 4,
             "_tpl": "5d235b4d86f7742e017bc88a"
         }
-        ]], "5ac3b934156ae10c4430e83c", 3, false, 2000);
+        ]], "5ac3b934156ae10c4430e83c", 3, false, 2000, 2);
 
         //BNTI LShZ-2DTM helmet
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6d3716a4b9361bc8618872", "5ac3b934156ae10c4430e83c", 163075, "RUB", 3, false, 20000, 3);
 
         //MSA Sordin Supreme PRO-X/L active headset
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa2ba71e5b5b000137b758f", "5ac3b934156ae10c4430e83c", 28272, "RUB", 3, false, 8000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa2ba71e5b5b000137b758f", "5ac3b934156ae10c4430e83c", 28272, "RUB", 3, false, 10000, 4);
 
         //BNTI Gzhel-K armor
 		id = HashUtil.generate();
@@ -424,7 +444,7 @@ class RagmanAssort
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e57ba86f7747fa141986d", "5ac3b934156ae10c4430e83c", 76035, "RUB", 3, false, 2000);
 
         //fort redut-m body armor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ca2151486f774244a3b8d30", "5ac3b934156ae10c4430e83c", 239800, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ca2151486f774244a3b8d30", "5ac3b934156ae10c4430e83c", 239800, "RUB", 3, false, 2000, 1);
 
         //5.11 tactical hexgrid plate carrier
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5fd4c474dd870108a754b241", "hideout", "hideout", [[{
@@ -440,13 +460,13 @@ class RagmanAssort
         ]], "5ac3b934156ae10c4430e83c", 3, false, 2000, 1);
 
         //nfm thor concealable vest body armor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "609e8540d5c319764c2bc2e9", "5ac3b934156ae10c4430e83c", 56610, "RUB", 3, false, 5000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "609e8540d5c319764c2bc2e9", "5ac3b934156ae10c4430e83c", 56610, "RUB", 3, false, 5000, 2);
 
         //wartech mk3 tv-104 chest rig
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5ab8dab586f77441cd04f2a2", "5ac3b934156ae10c4430e83c", 48263, "RUB", 3, false, 2000);
 
         //blackrock chest rig
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5648a69d4bdc2ded0b8b457b", "5ac3b934156ae10c4430e83c", 45177, "RUB", 3, false, 40000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5648a69d4bdc2ded0b8b457b", "5ac3b934156ae10c4430e83c", 45177, "RUB", 3, false, 40000, 6);
 
         //crye precision avs plate carrier
         CoreMod.CreateTraderBarter(HashUtil.generate(), "544a5caa4bdc2d1a388b4568", "hideout", "hideout", [[{
@@ -459,7 +479,7 @@ class RagmanAssort
         ]], "5ac3b934156ae10c4430e83c", 3, false, 5000, 2);
 
         //ana tactical alpha chest rig
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "592c2d1a86f7746dbe2af32a", "5ac3b934156ae10c4430e83c", 51181, "RUB", 3, false, 2000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "592c2d1a86f7746dbe2af32a", "5ac3b934156ae10c4430e83c", 51181, "RUB", 3, false, 5000);
 
         //ana tactical m2 armored rig
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5ab8dced86f774646209ec87", "hideout", "hideout", [[{
@@ -469,7 +489,7 @@ class RagmanAssort
             "count": 3,
             "_tpl": "5ac4c50d5acfc40019262e87"
         }
-        ]], "5ac3b934156ae10c4430e83c", 3, false, 5000, 2);
+        ]], "5ac3b934156ae10c4430e83c", 3, false, 2000, 2);
 
         //5.11 tactical tactec plate carrier
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5b44cad286f77402a54ae7e5", "hideout", "hideout", [[{
@@ -523,8 +543,22 @@ class RagmanAssort
         ]], "5ac3b934156ae10c4430e83c", 3, false, 20000, 3);
 
         //stich profi chest rig mk2 (assault, a-tacs fg)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "60a621c49c197e4e8c4455e6", "5ac3b934156ae10c4430e83c", 41625, "RUB", 3, false, 2000);
-
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "60a621c49c197e4e8c4455e6", "5ac3b934156ae10c4430e83c", 41625, "RUB", 3, false, 4000, 3);
+		
+		//Camelbak Tri-Zip
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "545cdae64bdc2d39198b4568", "5ac3b934156ae10c4430e83c", 41310, "RUB", 3, false, 10000, 3);
+		
+		//ZSh-1-2M helmet (Black)
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa7e4a4e5b5b000137b76f2", "5ac3b934156ae10c4430e83c", 41771, "RUB", 3, true, 999999, 4);
+		
+		//Oakley Mechanism heavy duty backpack (Black)
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d5d940f86f7742797262046", "5ac3b934156ae10c4430e83c", 43024, "RUB", 3, false, 2000, 2);
+		
+		//Hazard 4 Takedown sling backpack
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "6034d103ca006d2dca39b3f0", "5ac3b934156ae10c4430e83c", 38295, "RUB", 3, false, 2000, 2);
+		
+		//Hazard 4 Drawbridge backpack
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "60a272cc93ef783291411d8e", "5ac3b934156ae10c4430e83c", 39960, "RUB", 3, false, 5000, 4);
     }
     static GenerateLL4()
     {
@@ -535,7 +569,7 @@ class RagmanAssort
             "count": 4,
             "_tpl": "59e366c186f7741778269d85"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 2000, 3);
 
         //altyn face shield
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7e373e5b5b000137b76f0", "hideout", "hideout", [[{
@@ -544,21 +578,21 @@ class RagmanAssort
             "level": 20,
             "_tpl": "59f32bb586f774757e1e8442"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 3);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 2000, 3);
 
         //maska-1shch face shield (olive drab)
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0919b50db834001b7ce3b9", "hideout", "hideout", [[{
             "count": 2,
             "_tpl": "5d235b4d86f7742e017bc88a"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 1);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 2000, 1);
 
         //vulkan-5 face shield
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5ca2113f86f7740b2547e1d2", "hideout", "hideout", [[{
             "count": 7,
             "_tpl": "59e366c186f7741778269d85"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 2);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 2000, 2);
 
         //lshz-2dtm face shield
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6d3829a4b9361bc8618943", "5ac3b934156ae10c4430e83c", 37019, "RUB", 4, false, 2000, 2);
@@ -574,7 +608,7 @@ class RagmanAssort
             "count": 1,
             "_tpl": "57347c5b245977448d35f6e1"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 1);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 2000, 1);
 
         //oakley si m frame saftey glasses
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c1a1cc52e221602b3136e3d", "5ac3b934156ae10c4430e83c", 5217, "RUB", 4, false, 2000);
@@ -597,11 +631,11 @@ class RagmanAssort
             "count": 5,
             "_tpl": "5c12688486f77426843c7d32"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 1);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 200, 1);
 		CoreMod.CreateTraderAssortUnlock("5ac3b934156ae10c4430e83c", "success", id, "5c112d7e86f7740d6f647486"); // scavenger
 
         //shattered light armored mask
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b432b2f5acfc4771e1c6622", "5ac3b934156ae10c4430e83c", 26575, "RUB", 4, true, 2000, 7);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b432b2f5acfc4771e1c6622", "5ac3b934156ae10c4430e83c", 26575, "RUB", 4, true, 999999, 7);
 
         //deadly skull mask
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b432b6c5acfc4001a599bf0", "5ac3b934156ae10c4430e83c", 7584, "RUB", 4, false, 2000, 10);
@@ -617,7 +651,7 @@ class RagmanAssort
             "count": 5,
             "_tpl": "590c2b4386f77425357b6123"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 1);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 500, 1);
 
         //highcom striker ulach IIIA helmet (black)
 		id = HashUtil.generate();
@@ -646,7 +680,7 @@ class RagmanAssort
             "count": 1,
             "_tpl": "5e2af41e86f774755a234b67"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 1);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 2000, 1);
 
         //peltor tactical sport headset
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c165d832e2216398b5a7e36", "5ac3b934156ae10c4430e83c", 38295, "RUB", 4, false, 2000);
@@ -658,7 +692,7 @@ class RagmanAssort
             "level": 20,
             "_tpl": "59f32bb586f774757e1e8442"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 2000);
 
         //wartech tv-110 plate carrier rig
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e746986f7741453628fe5", "5ac3b934156ae10c4430e83c", 101232, "RUB", 4, false, 2000, 1);
@@ -674,7 +708,7 @@ class RagmanAssort
             "count": 3,
             "_tpl": "5e2af4a786f7746d3f3c3400"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 1);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 2000, 1);
 
         //ars arma a18 skanda plate carrier
 		id = HashUtil.generate();
@@ -685,7 +719,7 @@ class RagmanAssort
             "count": 1,
             "_tpl": "5734758f24597738025ee253"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 1);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 2000, 2);
 		CoreMod.CreateTraderAssortUnlock("5ac3b934156ae10c4430e83c", "success", id, "5c1141f386f77430ff393792"); // living high is not a crime part 2
 
         //iotv gen4 body armor (full protection)
@@ -694,7 +728,7 @@ class RagmanAssort
             "count": 3,
             "_tpl": "59e3639286f7741777737013"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 2);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 500, 2);
 		CoreMod.CreateTraderAssortUnlock("5ac3b934156ae10c4430e83c", "success", id, "5b478b1886f7744d1b23c57d"); // hot delivery
 
         //6B43 Zabralo-Sh 6A Armor
@@ -702,7 +736,7 @@ class RagmanAssort
             "count": 4,
             "_tpl": "545cdb794bdc2d3a198b456a"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 200);
 
         //lbt 6094a slick plate carrier
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5e4abb5086f77406975c9342", "hideout", "hideout", [[{
@@ -715,7 +749,7 @@ class RagmanAssort
             "count": 4,
             "_tpl": "5e2af4d286f7746d4159f07a"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 1);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 2000, 1);
 
         //fort redut-t5 body armor
 		id = HashUtil.generate();
@@ -726,7 +760,7 @@ class RagmanAssort
             "count": 2,
             "_tpl": "5c12688486f77426843c7d32"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 1);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 2000, 1);
 		CoreMod.CreateTraderAssortUnlock("5ac3b934156ae10c4430e83c", "success", id, "5ae449d986f774453a54a7e1"); // supervisor
 
         //nfm thor integrated carrier body armor
@@ -739,14 +773,14 @@ class RagmanAssort
             "count": 1,
             "_tpl": "5c1267ee86f77416ec610f72"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 3);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 20000, 3);
 
         //ana tactical beta 2 battle backpack
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5b44c6ae86f7742d1627baea", "hideout", "hideout", [[{
             "count": 6,
             "_tpl": "5d1b392c86f77425243e98fe"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 3);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 2000, 3);
 
         //mystery ranch blackjack 50 backpack (multicam)
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e774286f77468413cc5b2", "hideout", "hideout", [[{
@@ -756,7 +790,7 @@ class RagmanAssort
             "count": 2,
             "_tpl": "5e2af41e86f774755a234b67"
         }
-        ]], "5ac3b934156ae10c4430e83c", 4, false, 1);
+        ]], "5ac3b934156ae10c4430e83c", 4, false, 500, 1);
 
         //eberlestock g2 gunslinger II backpack (dry earth)
 		id = HashUtil.generate();
diff --git a/Ereshkigal-BaseAssortGenerator/src/skier.js b/Ereshkigal-BaseAssortGenerator/src/skier.js
index dd122ba..b589475 100644
--- a/Ereshkigal-BaseAssortGenerator/src/skier.js
+++ b/Ereshkigal-BaseAssortGenerator/src/skier.js
@@ -38,7 +38,7 @@ class SkierAssort {
         CoreMod.CreateTraderAssort(HashUtil.generate(), "59e5d83b86f7745aed03d262", "58330581ace78e27b8b10cee", 1147, "RUB", 1, true, 999999);
 
         //TOZ-106 20ga MC 20-01 Sb.3 2-shot magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a38ee51c4a282000c5a955c", "58330581ace78e27b8b10cee", 33, "RUB", 1, true, 999999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a38ee51c4a282000c5a955c", "58330581ace78e27b8b10cee", 903, "RUB", 1, true, 999999);
 
         //GEN M3 10 rounds
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5aaa5e60e5b5b000140293d6", "58330581ace78e27b8b10cee", 2302, "RUB", 1, false, 3000, 8);
@@ -421,6 +421,14 @@ class SkierAssort {
                     }
                 ]
             ], "58330581ace78e27b8b10cee", 1, false, 10000, 2);
+
+		// AK-74 Hexagon 5.45x39 sound suppressor
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssort(id, "593d493f86f7745e6b2ceb22", "58330581ace78e27b8b10cee", 45278, "RUB", 2, true, 999999, 5);
+
+		// AK-74M/AK-100 Zenit PT Lock
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssort(id, "5ac78eaf5acfc4001926317a", "58330581ace78e27b8b10cee", 3120, "RUB", 2, false, 12000, 10);
     }
     static GenerateLL3() {
         const CoreMod = require("../../CoreMod/src/Core.js");
@@ -760,6 +768,12 @@ class SkierAssort {
 
         //orsis t-5000m .308 bolt-action sniper rifle
         CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5e0354f786f77425b53eb6c5", "58330581ace78e27b8b10cee", 73329, "RUB", 3, false, 20000, 3);
+		
+        //AK Magpul MOE AKM handguard (Plum)
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "57cffe0024597763b03fc60b", "58330581ace78e27b8b10cee", 16263, "RUB", 3, false, 15000);
+		
+        // Remington M700 Magpul Pro 700 chassis
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cdeac22d7f00c000f26168f", "58330581ace78e27b8b10cee", 20668, "RUB", 3, false, 2000);
 
     }
     static GenerateLL4() {
@@ -805,7 +819,9 @@ class SkierAssort {
             ], "58330581ace78e27b8b10cee", 4, false, 15000);
 
         //AK Hexagon DTKP MK.2 7.62x39 sound suppressor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e208b9842457a4a7a33d074", "58330581ace78e27b8b10cee", 59472, "RUB", 4, false, 7000);
+		id = HashUtil.generate();
+        CoreMod.CreateTraderAssort(id, "5e208b9842457a4a7a33d074", "58330581ace78e27b8b10cee", 59472, "RUB", 4, false, 7000);
+		CoreMod.CreateTraderAssortUnlock("58330581ace78e27b8b10cee", "success", id, "5979ed3886f77431307dc512"); //What's on the flash drive?
 
         //SIG Sauer SRD762-QD 7.62x51 sound suppressor
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5fbe760793164a5b6278efc8", "hideout", "hideout", [
@@ -925,6 +941,21 @@ class SkierAssort {
                     }
                 ]
             ], "58330581ace78e27b8b10cee", 4, false, 100, 1);
+			
+        // 9x19mm RIP 20-round ammo box
+		id = HashUtil.generate();
+        CoreMod.CreateTraderBarter(id, "5c1127bdd174af44217ab8b9", "hideout", "hideout", [
+                [{
+					"count": 1,
+					"_tpl": "5734770f24597738025ee254"
+				}, {
+					"count": 1,
+					"_tpl": "573476f124597737e04bf328"
+				}
+                ]
+            ], "58330581ace78e27b8b10cee", 4, false, 2000, 8);
+			CoreMod.CreateTraderAssortUnlock("58330581ace78e27b8b10cee", "success", id, "5c1234c286f77406fa13baeb"); //setup
+			
     }
     static generateSkierAssort() {
         SkierAssort.GenerateLL1();
diff --git a/Ereshkigal-BaseAssortGenerator/src/therapist.js b/Ereshkigal-BaseAssortGenerator/src/therapist.js
index 9615911..f0599d1 100644
--- a/Ereshkigal-BaseAssortGenerator/src/therapist.js
+++ b/Ereshkigal-BaseAssortGenerator/src/therapist.js
@@ -188,7 +188,7 @@ class TherapistAssort {
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5be4038986f774527d3fae60", "54cb57776803fa99248b456e", 10157, "RUB", 2, false, 2000);
 
         //Dogtag case
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c093e3486f77430cb02e593", "54cb57776803fa99248b456e", 447330, "RUB", 2, false, 20000, 1);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c093e3486f77430cb02e593", "54cb57776803fa99248b456e", 344100, "RUB", 2, false, 20000, 1);
 
         //Aluminium splint
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5af0454c86f7746bf20992e8", "hideout", "hideout", [[{
@@ -470,7 +470,7 @@ class TherapistAssort {
         CoreMod.CreateTraderAssort(HashUtil.generate(), "590c657e86f77412b013051d", "54cb57776803fa99248b456e", 49836, "RUB", 4, false, 7000, 3);
 
         //Propital regenerative stimulant injector
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e530286f7747fa1419862", "54cb57776803fa99248b456e", 49836, "RUB", 4, false, 2000, 4);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e530286f7747fa1419862", "54cb57776803fa99248b456e", 26074, "RUB", 4, false, 2000, 4);
 
         //sj6 tglabs combat stimulant injector
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e531d86f7747fa23f4d42", "hideout", "hideout", [
@@ -489,7 +489,7 @@ class TherapistAssort {
 
         //adrenaline injector
         id = HashUtil.generate()
-        CoreMod.CreateTraderAssort(id, "5c10c8fd86f7743d7d706df3", "54cb57776803fa99248b456e", 28630, "RUB", 4, false, 20000, 3);
+        CoreMod.CreateTraderAssort(id, "5c10c8fd86f7743d7d706df3", "54cb57776803fa99248b456e", 30892, "RUB", 4, false, 20000, 3);
         CoreMod.CreateTraderAssortUnlock("54cb57776803fa99248b456e", "success", id, "5c0d0d5086f774363760aef2") //Athlete
 
         //pack of sugar