diff --git a/Ereshkigal-BaseAssortGenerator/src/prapor.js b/Ereshkigal-BaseAssortGenerator/src/prapor.js
index 686779a..f21d727 100644
--- a/Ereshkigal-BaseAssortGenerator/src/prapor.js
+++ b/Ereshkigal-BaseAssortGenerator/src/prapor.js
@@ -138,14 +138,22 @@ class PraporAssort {
         //Axion Kobra sight shade
         CoreMod.CreateTraderAssort(HashUtil.generate(), "591c4e1186f77410354b316e", "54cb50c76803fa8b248b4571", 109, "RUB", 1, false, 85000);
 
+		//ak 7.62x39 6l20 30-round magazine
+		CoreMod.CreateTraderBarter(HashUtil.generate(), "5a01c29586f77474660c694c", "hideout", "hideout", [
+					[{
+						"count": 1,
+						"_tpl": "590c2b4386f77425357b6123"
+					}]
+				], "54cb50c76803fa8b248b4571", 1, false, 5000, 12);
+
         //NPZ USP-1 scope eyecup
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf639aad7f00c065703d455", "54cb50c76803fa8b248b4571", 301, "RUB", 1, false, 2000);
 
         //AK-74 5.45x39 muzzle brake & compensator (6P20 0-20)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5649aa744bdc2ded0b8b457e", "54cb50c76803fa8b248b4571", 757, "RUB", 1, false, 70000);
 		
-		    //akm 7.62x39 muzzle brake & compensator (6p1 0-14)
-		    CoreMod.CreateTraderAssort(HashUtil.generate(), "59d64fc686f774171b243fe2", "54cb50c76803fa8b248b4571", 663, "RUB", 1, false, 2000, 4);
+		//akm 7.62x39 muzzle brake & compensator (6p1 0-14)
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "59d64fc686f774171b243fe2", "54cb50c76803fa8b248b4571", 663, "RUB", 1, false, 2000, 4);
 
         //AKS-74U 5.45x39 muzzle brake (6P26 0-20)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "57dc324a24597759501edc20", "54cb50c76803fa8b248b4571", 784, "RUB", 1, false, 70000);
@@ -187,9 +195,11 @@ class PraporAssort {
 
         //PU 3.5x rifle scope
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3f7c1c5acfc40dc5296b1d", "54cb50c76803fa8b248b4571", 13446, "RUB", 1, false, 20000, 5);
-
-        //Zenit-BelOMO PSO-1 4x24 scope
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c82342f2e221644f31c060e", "54cb50c76803fa8b248b4571", 19385, "RUB", 1, false, 20000, 4);
+		
+		//Zenit-BelOMO PSO-1M2-1 4x24 scope
+        id = HashUtil.generate()
+        CoreMod.CreateTraderAssort(id, "576fd4ec2459777f0b518431", "54cb50c76803fa8b248b4571", 19385, "RUB", 1, false, 20000, 4);
+        CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "5967530a86f77462ba22226b"); //Bad rep evidence
 
         //USP-1 scope
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf638cbd7f00c06595bc936", "54cb50c76803fa8b248b4571", 15805, "RUB", 1, false, 20000);
@@ -242,6 +252,11 @@ class PraporAssort {
         //SKS
         id = HashUtil.generate();
         CoreMod.CreateTraderAssortWithPreset(id, "58dffce486f77409f40f8162", "54cb50c76803fa8b248b4571", 21810, "RUB", 1, true, 999999);
+		
+		//AKS-74u
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "584147732459775a2b6d9f12", "54cb50c76803fa8b248b4571", 28823, "RUB", 1, false, 700000);
+        CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "5936d90786f7742b1420ba5b");
 
         //AKS-74UN
         id = HashUtil.generate();
@@ -253,12 +268,7 @@ class PraporAssort {
                 "count": 1,
                 "_tpl": "5e2af00086f7746d3f3c33f7"
             }]
-        ], "54cb50c76803fa8b248b4571", 1, false, 7000);
-
-        //AKS-74u
-        id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "584147732459775a2b6d9f12", "54cb50c76803fa8b248b4571", 28823, "RUB", 1, false, 700000);
-        CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "5936d90786f7742b1420ba5b");
+        ], "54cb50c76803fa8b248b4571", 1, false, 7000, 1);
 
         //AKM
         id = HashUtil.generate();
@@ -288,10 +298,15 @@ class PraporAssort {
         //tt-33
         id = HashUtil.generate();
         CoreMod.CreateTraderAssortWithPreset(id, "58414a2724597759b344da4d", "54cb50c76803fa8b248b4571", 8194, "RUB", 1, false, 200000);
-
-        //mp-443
+		
+		        //MP-443 Grach
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "584148a524597759eb357a44", "54cb50c76803fa8b248b4571", 13816, "RUB", 1, false, 200000);
+        CoreMod.CreateTraderBarterWithPreset(id, "584148a524597759eb357a44", "hideout", "hideout", [
+            [{
+                "count": 1,
+                "_tpl": "573477e124597737dd42e191"
+            }]
+        ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2);
 		
 		//mp-443
         id = HashUtil.generate();
@@ -350,7 +365,7 @@ class PraporAssort {
             }]
         ], "54cb50c76803fa8b248b4571", 1, false, 2000, 1);
 
-        //SFera-S
+        //sssh-95 SFera-S
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa7d193e5b5b000171d063f", "hideout", "hideout", [
             [{
                 "count": 2,
@@ -403,11 +418,6 @@ class PraporAssort {
         const CoreMod = require("../../CoreMod/src/Core.js");
         let id = null;
 
-        //Zenit-BelOMO PSO-1M2-1 4x24 scope
-        id = HashUtil.generate()
-        CoreMod.CreateTraderAssort(id, "576fd4ec2459777f0b518431", "54cb50c76803fa8b248b4571", 21565, "RUB", 1, false, 20000, 4);
-        CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "5967530a86f77462ba22226b"); //Bad rep evidence
-
         //Haxagon 12k supressor
         id = HashUtil.generate()
         CoreMod.CreateTraderAssort(id, "59c0ec5b86f77435b128bfca", "54cb50c76803fa8b248b4571", 25112, "RUB", 2, false, 10000);
@@ -434,10 +444,10 @@ class PraporAssort {
         //SP5 gs
         CoreMod.CreateTraderAssort(HashUtil.generate(), "57a0dfb82459774d3078b56c", "54cb50c76803fa8b248b4571", 236, "RUB", 2, true, 999999);
 
-        //T-45M1
+        //T-45M1 gzh
         CoreMod.CreateTraderAssort(HashUtil.generate(), "59e4cf5286f7741778269d8a", "54cb50c76803fa8b248b4571", 73, "RUB", 2, true, 999999, 400);
 
-        //9x21 p gzh
+        //9x21mm p gzh
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a26abfac4a28232980eabff", "54cb50c76803fa8b248b4571", 164, "RUB", 2, false, 40000, 400);
 
         //T-46M
@@ -445,27 +455,63 @@ class PraporAssort {
 
         //Shrapnel-10 buckshot
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5e85a9a6eacf8c039e4e2ac1", "54cb50c76803fa8b248b4571", 86, "RUB", 2, false, 200000, 80);
+		
+		//RGD-5 Hand grenade
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5448be9a4bdc2dfd2f8b456a", "hideout", "hideout", [
+            [{
+                "count": 2,
+                "_tpl": "590a3cd386f77436f20848cb"
+            }]
+        ], "54cb50c76803fa8b248b4571", 2, true, 999999, 3);
 
-        //Zarya
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a0c27731526d80618476ac4", "54cb50c76803fa8b248b4571", 8418, "RUB", 2, false, 200000, 10);
+        //Zarya stun grenade
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a0c27731526d80618476ac4", "54cb50c76803fa8b248b4571", 7320, "RUB", 2, false, 200000, 10);
 
         //SV-98 7.62x54R polymer 10-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "559ba5b34bdc2d1f1a8b4582", "54cb50c76803fa8b248b4571", 4251, "RUB", 2, false, 30000);
+		
+		//6L18 45-round magazine
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "564ca9df4bdc2d35148b4569", "hideout", "hideout", [
+            [{
+                "count": 1,
+                "_tpl": "590c346786f77423e50ed342"
+            }]
+        ], "54cb50c76803fa8b248b4571", 2, false, 6000, 10);
 
-        //6L24
+        //vss 9x39 6L24 10-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "57838f0b2459774a256959b2", "54cb50c76803fa8b248b4571", 5055, "RUB", 2, false, 10000, 8);
+		
+		//vss 9x39 6L25 20-round magazine
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "57838f9f2459774a150289a0", "hideout", "hideout", [
+            [{
+                "count": 1,
+                "_tpl": "590c639286f774151567fa95"
+            }]
+        ], "54cb50c76803fa8b248b4571", 2, false, 2000, 5);
+		
+		
+		//PP-91 9x18PM 30-round magazine
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "57d1519e24597714373db79d", "54cb50c76803fa8b248b4571", 3136, "RUB", 2, false, 15000, 12);
 
         //SR-1MP 9x21 18-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "59f99a7d86f7745b134aa97b", "54cb50c76803fa8b248b4571", 1642, "RUB", 2, true, 999999);
 
-        //6L10
+        //6L10 30-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a01c29586f77474660c694c", "54cb50c76803fa8b248b4571", 2152, "RUB", 2, true, 999999);
 
         //AK-103 7.62x39 30-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5ac66bea5acfc43b321d4aec", "54cb50c76803fa8b248b4571", 2110, "RUB", 2, true, 999999);
 
-        //6L23 Plum
+        //6L23 30-round magazine Plum
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cbdaf89ae9215000e5b9c94", "54cb50c76803fa8b248b4571", 2289, "RUB", 2, false, 20000);
+		
+		//PPSH-41 71-round drum magazine
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5ea034f65aad6446a939737e", "hideout", "hideout", [
+            [{
+                "count": 1,
+                "_tpl": "5d1c819a86f774771b0acd6c"
+            }]
+        ], "54cb50c76803fa8b248b4571", 2, false, 5000, 2);
 
         //PL-15 9x19 16-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "602286df23506e50807090c6", "54cb50c76803fa8b248b4571", 1500, "RUB", 2, true, 999999);
@@ -473,22 +519,33 @@ class PraporAssort {
         //NSPU-M Eyecup
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5ba36f85d4351e0085325c81", "54cb50c76803fa8b248b4571", 285, "RUB", 2, false, 2000);
 
-        //1p59 Eyecup
+        //kmz 1p59 scope Eyecup
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d0b5cd3d7ad1a3fe32ad263", "54cb50c76803fa8b248b4571", 628, "RUB", 2, false, 2000);
+		
+		//Valday PS-320 1x/6x scope
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0517910db83400232ffee5", "hideout", "hideout", [
+            [{
+                "count": 2,
+                "_tpl": "5d40407c86f774318526545a"
+            }, {
+                "count": 1,
+                "_tpl": "590c5f0d86f77413997acfab"
+            }]
+        ], "54cb50c76803fa8b248b4571", 2, false, 2000, 2);
 
-        //EKP-8-18
+        //axion kobra EKP-8-18 reflex sight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "591c4efa86f7741030027726", "54cb50c76803fa8b248b4571", 15260, "RUB", 2, false, 6000, 4);
 
-        //Krechet
+        //Valday Krechet reflex sight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "609a63b6e2ff132951242d09", "54cb50c76803fa8b248b4571", 14416, "RUB", 2, true, 999999);
 
-        //TT01
+        //TT01 ear sight weaver
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5649d9a14bdc2d79388b4580", "54cb50c76803fa8b248b4571", 2941, "RUB", 2, false, 15000, 5);
 
         //AKMP Rear sight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a0ed824fcdbcb0176308b0d", "54cb50c76803fa8b248b4571", 513, "RUB", 2, false, 2000);
 
-        //AKMP Front sight
+        //AKMP Front sight device
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a0f096dfcdbcb0176308b15", "54cb50c76803fa8b248b4571", 513, "RUB", 2, false, 2000);
 
         //1P59 riflescope
@@ -509,7 +566,7 @@ class PraporAssort {
         //6P20 Sb.5
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5649b1c04bdc2d16268b457c", "54cb50c76803fa8b248b4571", 2014, "RUB", 2, false, 50000);
 
-        //6G15U
+        //ak gp-25 acessory kit recoil pad 6G15U
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a0c59791526d8dba737bba7", "54cb50c76803fa8b248b4571", 3522, "RUB", 2, false, 20000, 8);
 
         //6P20 Sb.7 PLum
@@ -532,71 +589,132 @@ class PraporAssort {
 
         //PP-19-01 Vityaz-SN dust cover STD
         CoreMod.CreateTraderAssort(HashUtil.generate(), "59985a8086f77414ec448d1a", "54cb50c76803fa8b248b4571", 1307, "RUB", 2, false, 15000);
-        //6L25
-        CoreMod.CreateTraderBarter(HashUtil.generate(), "57838f9f2459774a150289a0", "hideout", "hideout", [
+		
+		//AK-74N Wood
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "5841474424597759ba49be91", "54cb50c76803fa8b248b4571", 40078, "RUB", 2, false, 60000);
+		
+        //AK-74N Black
+        id = HashUtil.generate();
+        CoreMod.CreateTraderBarterWithPreset(id, "AK-74N_Black", "hideout", "hideout", [
             [{
-                "count": 1,
-                "_tpl": "590c639286f774151567fa95"
+                "count": 5,
+                "_tpl": "573475fb24597737fb1379e1"
             }]
-        ], "54cb50c76803fa8b248b4571", 2, false, 2000, 5);
-
-        //6L31
-        id = HashUtil.generate()
-        CoreMod.CreateTraderBarter(id, "55d482194bdc2d1d4e8b456b", "hideout", "hideout", [
+        ], "54cb50c76803fa8b248b4571", 2, false, 20000, 2);
+		
+        //AKS-74UN
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "584147ed2459775a77263501", "54cb50c76803fa8b248b4571", 40326, "RUB", 2, true, 7000);
+		
+		//AKS-74UB
+        id = HashUtil.generate();
+        CoreMod.CreateTraderBarterWithPreset(id, "584147982459775a6c55e931", "hideout", "hideout", [
             [{
                 "count": 1,
-                "_tpl": "5d1b32c186f774252167a530"
-            }]
-        ], "54cb50c76803fa8b248b4571", 2, false, 2000, 5);
-        CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "59675d6c86f7740a842fc482"); //Ice cream cones
-
-        //5x45 BT x30 GS box
-        CoreMod.CreateTraderBarter(HashUtil.generate(), "57372c89245977685d4159b1", "hideout", "hideout", [
-            [{
-                "count": 1,
-                "_tpl": "590a373286f774287540368b"
-            }]
-        ], "54cb50c76803fa8b248b4571", 2, false, 2000);
-
-        //RGD-5 Hand grenade
-        CoreMod.CreateTraderBarter(HashUtil.generate(), "5448be9a4bdc2dfd2f8b456a", "hideout", "hideout", [
-            [{
-                "count": 1,
-                "_tpl": "590a3cd386f77436f20848cb"
-            }]
-        ], "54cb50c76803fa8b248b4571", 2, true, 999999);
-
-        //6L18
-        CoreMod.CreateTraderBarter(HashUtil.generate(), "564ca9df4bdc2d35148b4569", "hideout", "hideout", [
-            [{
-                "count": 1,
-                "_tpl": "590a3c0a86f774385a33c450"
+                "_tpl": "59e3658a86f7741776641ac4"
+            }, {
+                "count": 2,
+                "_tpl": "5909e99886f7740c983b9984"
             }, {
                 "count": 1,
-                "_tpl": "590c311186f77424d1667482"
+                "_tpl": "573476d324597737da2adc13"
             }]
-        ], "54cb50c76803fa8b248b4571", 2, false, 6000, 10);
-
-        //PPSH Drum mag
-        CoreMod.CreateTraderBarter(HashUtil.generate(), "5ea034f65aad6446a939737e", "hideout", "hideout", [
-            [{
-                "count": 1,
-                "_tpl": "5d1c819a86f774771b0acd6c"
-            }]
-        ], "54cb50c76803fa8b248b4571", 2, false, 5000, 2);
-
-        //Valday PS-320 1x/6x scope
-        CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0517910db83400232ffee5", "hideout", "hideout", [
+        ], "54cb50c76803fa8b248b4571", 2, false, 1000, 2);
+		
+        //AKM
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "59e8d2ab86f77407f03fc9c2", "54cb50c76803fa8b248b4571", 43069, "RUB", 2, true, 110000);
+		
+		//AKMS
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "5a327f4a86f774766866140b", "54cb50c76803fa8b248b4571", 41873, "RUB", 2, true, 2000);
+		
+		//AKS-74N
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "5ac4abf986f7747d117c67aa", "54cb50c76803fa8b248b4571", 38072, "RUB", 2, false, 20000);
+		
+		//AK-74
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "5c0c1ce886f77401c119d014", "54cb50c76803fa8b248b4571", 34309, "RUB", 2, false, 20000);
+		
+		//AK-74 Plum
+        id = HashUtil.generate();
+        CoreMod.CreateTraderBarterWithPreset(id, "5dd7f8c524e5d7504a4e3077", "hideout", "hideout", [
             [{
                 "count": 2,
-                "_tpl": "5d40407c86f774318526545a"
+                "_tpl": "5c13cef886f774072e618e82"
             }, {
+                "count": 2,
+                "_tpl": "57347c93245977448d35f6e3"
+            }]
+        ], "54cb50c76803fa8b248b4571", 2, false, 2000, 1);
+		
+		//pb 9x18pm silenced pistol
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "584149452459775992479702", "54cb50c76803fa8b248b4571", 21467, "RUB", 2, false, 2000);
+		
+		//mp-443
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "584148a524597759eb357a44", "54cb50c76803fa8b248b4571", 13816, "RUB", 2, false, 200000);
+		
+		//SR-1MP
+        id = HashUtil.generate();
+        CoreMod.CreateTraderBarterWithPreset(id, "5a327f6386f77479010da870", "hideout", "hideout", [
+            [{
                 "count": 1,
-                "_tpl": "590c5f0d86f77413997acfab"
+                "_tpl": "590c5a7286f7747884343aea"
+            }]
+        ], "54cb50c76803fa8b248b4571", 2, false, 300, 2);
+		
+		//aps 9x18pm machine pistol
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "5ac4accf86f774181345c3d7", "54cb50c76803fa8b248b4571", 15864, "RUB", 2, false, 20000);
+		
+		//toz ks-23m Long
+        id = HashUtil.generate();
+        CoreMod.CreateTraderBarterWithPreset(id, "5f6771214ef1ca4f4e1b8a06", "hideout", "hideout", [
+            [{
+                "count": 4,
+                "_tpl": "590c2c9c86f774245b1f03f2"
+            }, {
+                "count": 4,
+                "_tpl": "57347cd0245977445a2d6ff1"
+            }, {
+                "count": 3,
+                "_tpl": "5909e99886f7740c983b9984"
             }]
         ], "54cb50c76803fa8b248b4571", 2, false, 2000, 2);
 
-        //MPL-50 Entrenching tool
+        //PP-91-01 Kedr-B
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "584149ea2459775a6c55e940", "54cb50c76803fa8b248b4571", 36154, "RUB", 2, false, 5000, 2);
+
+        //PP-9 Klin
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "584149ad2459775a7726350e", "54cb50c76803fa8b248b4571", 23427, "RUB", 2, false, 20000);
+
+        //PP-19-01 Vityaz SN
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "59b81f7386f77421ac688a0a", "54cb50c76803fa8b248b4571", 21514, "RUB", 2, false, 65000);
+
+        //SV-98
+        id = HashUtil.generate();
+        CoreMod.CreateTraderBarterWithPreset(id, "58414a16245977599247970a", "hideout", "hideout", [
+            [{
+                "count": 5,
+                "_tpl": "573475fb24597737fb1379e1"
+            }, {
+                "count": 3,
+                "_tpl": "573476d324597737da2adc13"
+            }]
+        ], "54cb50c76803fa8b248b4571", 2, false, 2000, 2);
+		
+		
+        //Mosin bolt action rifle
+        id = HashUtil.generate();
+        CoreMod.CreateTraderAssortWithPreset(id, "5b8683a486f77467f2423114", "54cb50c76803fa8b248b4571", 56271, "RUB", 2, false, 20000);
+		
+		//MPL-50 Entrenching tool
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5bead2e00db834001c062938", "hideout", "hideout", [
             [{
                 "count": 2,
@@ -614,127 +732,24 @@ class PraporAssort {
                 "_tpl": "5b43575a86f77424f443fe62"
             }]
         ], "54cb50c76803fa8b248b4571", 2, false, 2000, 1);
-
-        //AK-74N Wood
-        id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5841474424597759ba49be91", "54cb50c76803fa8b248b4571", 40078, "RUB", 2, true, 60000);
-
-        //AKS-74UN
-        id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "584147ed2459775a77263501", "54cb50c76803fa8b248b4571", 40326, "RUB", 2, true, 7000);
-
-        //AKM
-        id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "59e8d2ab86f77407f03fc9c2", "54cb50c76803fa8b248b4571", 43069, "RUB", 2, true, 110000);
-
-        //AKMS
-        id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5a327f4a86f774766866140b", "54cb50c76803fa8b248b4571", 41873, "RUB", 2, true, 2000);
-
-        //AKS-74N
-        id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5ac4abf986f7747d117c67aa", "54cb50c76803fa8b248b4571", 38072, "RUB", 2, false, 20000);
-
-        //AK-74
-        id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5c0c1ce886f77401c119d014", "54cb50c76803fa8b248b4571", 34309, "RUB", 2, false, 20000);
-
-        //PP-91-01 Kedr-B
-        id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "584149ea2459775a6c55e940", "54cb50c76803fa8b248b4571", 36154, "RUB", 2, false, 5000, 2);
-
-        //PP-9 Klin
-        id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "584149ad2459775a7726350e", "54cb50c76803fa8b248b4571", 23427, "RUB", 2, false, 20000);
-
-        //PP-19-01 Vityaz SN
-        id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "59b81f7386f77421ac688a0a", "54cb50c76803fa8b248b4571", 21514, "RUB", 2, false, 65000);
-
-        //Mosin bolt action rifle
-        id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5b8683a486f77467f2423114", "54cb50c76803fa8b248b4571", 56271, "RUB", 2, false, 20000);
-
-        //AK-74N Black
-        id = HashUtil.generate();
-        CoreMod.CreateTraderBarterWithPreset(id, "AK-74N_Black", "hideout", "hideout", [
-            [{
-                "count": 5,
-                "_tpl": "573475fb24597737fb1379e1"
-            }]
-        ], "54cb50c76803fa8b248b4571", 2, false, 20000, 2);
-
-        //AKS-74UB
-        id = HashUtil.generate();
-        CoreMod.CreateTraderBarterWithPreset(id, "584147982459775a6c55e931", "hideout", "hideout", [
+		
+		//6L31 60-round magazine
+        id = HashUtil.generate()
+        CoreMod.CreateTraderBarter(id, "55d482194bdc2d1d4e8b456b", "hideout", "hideout", [
             [{
                 "count": 1,
-                "_tpl": "59e3658a86f7741776641ac4"
-            }, {
-                "count": 2,
-                "_tpl": "5909e99886f7740c983b9984"
-            }, {
-                "count": 1,
-                "_tpl": "573476d324597737da2adc13"
+                "_tpl": "5d1b32c186f774252167a530"
             }]
-        ], "54cb50c76803fa8b248b4571", 2, false, 1000, 2);
+        ], "54cb50c76803fa8b248b4571", 2, false, 2000, 5);
+        CoreMod.CreateTraderAssortUnlock("54cb50c76803fa8b248b4571", "success", id, "59675d6c86f7740a842fc482"); //Ice cream cones
 
-        //AK-74 Plum
-        id = HashUtil.generate();
-        CoreMod.CreateTraderBarterWithPreset(id, "5dd7f8c524e5d7504a4e3077", "hideout", "hideout", [
-            [{
-                "count": 2,
-                "_tpl": "5c13cef886f774072e618e82"
-            }, {
-                "count": 2,
-                "_tpl": "57347c93245977448d35f6e3"
-            }]
-        ], "54cb50c76803fa8b248b4571", 2, false, 2000, 2);
-
-        //ks-23m Long
-        id = HashUtil.generate();
-        CoreMod.CreateTraderBarterWithPreset(id, "5f6771214ef1ca4f4e1b8a06", "hideout", "hideout", [
-            [{
-                "count": 4,
-                "_tpl": "590c2c9c86f774245b1f03f2"
-            }, {
-                "count": 4,
-                "_tpl": "57347cd0245977445a2d6ff1"
-            }, {
-                "count": 3,
-                "_tpl": "5909e99886f7740c983b9984"
-            }]
-        ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2);
-
-        //SV-98
-        id = HashUtil.generate();
-        CoreMod.CreateTraderBarterWithPreset(id, "58414a16245977599247970a", "hideout", "hideout", [
-            [{
-                "count": 5,
-                "_tpl": "573475fb24597737fb1379e1"
-            }, {
-                "count": 3,
-                "_tpl": "573476d324597737da2adc13"
-            }]
-        ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2);
-
-        //MP-443 Grach
-        id = HashUtil.generate();
-        CoreMod.CreateTraderBarterWithPreset(id, "584148a524597759eb357a44", "hideout", "hideout", [
+        //5x45 BT x30 GS box
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "57372c89245977685d4159b1", "hideout", "hideout", [
             [{
                 "count": 1,
-                "_tpl": "573477e124597737dd42e191"
+                "_tpl": "590a373286f774287540368b"
             }]
-        ], "54cb50c76803fa8b248b4571", 1, false, 2000, 2);
-
-        //SR-1MP
-        id = HashUtil.generate();
-        CoreMod.CreateTraderBarterWithPreset(id, "5a327f6386f77479010da870", "hideout", "hideout", [
-            [{
-                "count": 1,
-                "_tpl": "590c5a7286f7747884343aea"
-            }]
-        ], "54cb50c76803fa8b248b4571", 1, false, 300, 2);
+        ], "54cb50c76803fa8b248b4571", 2, false, 2000);
 
     }
     static GenerateLL3() {