diff --git a/Ereshkigal-BaseAssortGenerator/src/jeager.js b/Ereshkigal-BaseAssortGenerator/src/jeager.js
index 1119c74..754c3ab 100644
--- a/Ereshkigal-BaseAssortGenerator/src/jeager.js
+++ b/Ereshkigal-BaseAssortGenerator/src/jeager.js
@@ -12,9 +12,585 @@ class JeagerAssort {
             "loyal_level_items": {}
         };
         //                               ASSORT ID            ITEM TEMPLATE               TRADER ID             PRICE   CURRENCY   LOYALTY   UNLIMITED      STOCK   MAXIMUM BUY
+
+        //12/70 7mm buckshot
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "560d5e524bdc2d25448b4571", "5c0647fdd443bc2504c2d371", 32, "RUB", 1, true, 999999);
+
+        //5.45x39mm fmj
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "56dff0bed2720bb0668b4567", "5c0647fdd443bc2504c2d371", 38, "RUB", 1, true, 999999);
+
+        //5.45x39mm hp
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "56dff216d2720bbd668b4568", "5c0647fdd443bc2504c2d371", 72, "RUB", 1, true, 999999);
+
+        //7.62x25mm TT lrn
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "573601b42459776410737435", "5c0647fdd443bc2504c2d371", 51, "RUB", 1, true, 999999);
+
+        //7.62x25mm TT lrnpc
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "573602322459776445391df1", "5c0647fdd443bc2504c2d371", 72, "RUB", 1, true, 999999);
+
+        //9x18mm pm psv
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5737207f24597760ff7b25f2", "5c0647fdd443bc2504c2d371", 73, "RUB", 1, true, 999999, 400);
+
+        //12/70 lead slug
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "58820d1224597753c90aeb13", "5c0647fdd443bc2504c2d371", 59, "RUB", 1, true, 999999);
+
+        //9x19mm pso gzh
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "58864a4f2459770fcc257101", "5c0647fdd443bc2504c2d371", 52, "RUB", 1, true, 999999);
+
+        //7.62x39mm hp
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e4d3d286f774176a36250a", "5c0647fdd443bc2504c2d371", 63, "RUB", 1, true, 999999);
+
+        //.366 tkm fmj
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e6542b86f77411dc52a77a", "5c0647fdd443bc2504c2d371", 45, "RUB", 1, true, 999999);
+
+        //.366 tkm eko
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e655cb86f77411dc52a77b", "5c0647fdd443bc2504c2d371", 69, "RUB", 1, true, 999999);
+
+        //5.56x45mm hp
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e6927d86f77411da468256", "5c0647fdd443bc2504c2d371", 61, "RUB", 1, true, 999999);
+
+        //20/70 7.5mm buckshot
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a38ebd9c4a282000d722a5b", "5c0647fdd443bc2504c2d371", 26, "RUB", 1, true, 999999);
+
+        //20/70 7.5mm buckshot
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a38ebd9c4a282000d722a5b", "5c0647fdd443bc2504c2d371", 26, "RUB", 1, true, 999999);
+
+        //12/70 5.25mm buckshot
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e6772a4b936088465b17c", "5c0647fdd443bc2504c2d371", 37, "RUB", 1, true, 999999);
+
+        //12/70 6.5mm express buckshot
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e67fba4b9361bc73bc779", "5c0647fdd443bc2504c2d371", 41, "RUB", 1, false, 200000, 200);
+
+        //12/70 grizzly 40 slug
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e6869a4b9361c140bcfde", "5c0647fdd443bc2504c2d371", 70, "RUB", 1, false, 200000, 200);
+
+        //12/70 "poleva-3" slug
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e6891a4b9361bd473feea", "5c0647fdd443bc2504c2d371", 54, "RUB", 1, false, 200000, 500);
+
+        //20/70 5.6mm buckshot
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e695fa4b936359b35d852", "5c0647fdd443bc2504c2d371", 21, "RUB", 1, true, 999999);
+
+        //20/70 "poleva-6u" slug
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e6a42a4b9364f07165f52", "5c0647fdd443bc2504c2d371", 69, "RUB", 1, true, 999999);
+
+        //20/70 "poleva-3" slug
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e6a53a4b9361bd473feec", "5c0647fdd443bc2504c2d371", 51, "RUB", 1, true, 999999);
+
+        //7.62x51mm sp
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e023e6e34d52a55c3304f71", "5c0647fdd443bc2504c2d371", 116, "RUB", 1, true, 999999);
+
+        //mp-133 12ga 6-shell magazine
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d484b44bdc2d1d4e8b456d", "5c0647fdd443bc2504c2d371", 1318, "RUB", 1, false, 6000);
+
+        //sok-12 12/76 sb.5 5-round magazine
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "57616a9e2459773c7a400234", "5c0647fdd443bc2504c2d371", 1779, "RUB", 1, false, 7000);
+
+        //sks 7.62x39 10-round internal box magazine
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "587df3a12459772c28142567", "5c0647fdd443bc2504c2d371", 1680, "RUB", 1, false, 2000, 4);
+
+        //mp-153 12ga 6-shell magazine extension
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5882163824597757561aa922", "5c0647fdd443bc2504c2d371", 1283, "RUB", 1, false, 15000);
+
+        //mp-153 12ga 5-shell magazine extension
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5882163e24597758206fee8c", "5c0647fdd443bc2504c2d371", 948, "RUB", 1, false, 15000);
+
+        //toz-106 20ga mc 20-01 sb.3 4-shot magazine
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a38ed75c4a28232996e40c6", "5c0647fdd443bc2504c2d371", 1129, "RUB", 1, false, 7000);
+
+        //toz-106 20ga mc 20-01 sb.3 2-shot magazine
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a38ee51c4a282000c5a955c", "5c0647fdd443bc2504c2d371", 825, "RUB", 1, true, 999999);
+
+        //vpo-215 .366 tkm metal 4-round magazine
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5de653abf76fdc1ce94a5a2a", "5c0647fdd443bc2504c2d371", 1260, "RUB", 1, true, 999999);
+
+        //cms kit
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5d02778e86f774203e7dedbe", "hideout", "hideout", [[{
+                        "count": 2,
+                        "_tpl": "5d40425986f7743185265461"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 1, false, 5000, 2);
+
+        //saiga-9 9x19 muzzle brake/compensator
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5998598e86f7740b3f498a86", "5c0647fdd443bc2504c2d371", 525, "RUB", 1, false, 15000);
+
+        //me cylinder 12ga muzzle adapter
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0111ab0db834001966914d", "5c0647fdd443bc2504c2d371", 2258, "RUB", 1, false, 5000, 3);
+
+        //mosin custom thread adapter
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf79389d7f00c10941a0c4d", "5c0647fdd443bc2504c2d371", 1575, "RUB", 1, false, 2000);
+
+        //axion kobra ekp-8-18 reflex sight
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "591c4efa86f7741030027726", "5c0647fdd443bc2504c2d371", 14700, "RUB", 1, false, 115000, 5);
+
+        //vomz pilad target ring reflex sight
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "609b9e31506cf869cf3eaf41", "5c0647fdd443bc2504c2d371", 9206, "RUB", 1, false, 4000, 4);
+
+        //belomo pk-06 reflex sight
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "57ae0171245977343c27bfcf", "5c0647fdd443bc2504c2d371", 8400, "RUB", 1, false, 11000, 3);
+
+        //sks standard rear sight
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "574db213245977459a2f3f5d", "5c0647fdd443bc2504c2d371", 315, "RUB", 1, false, 2000);
+
+        //vpo-209 rear sight
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e8977386f77415a553c453", "5c0647fdd443bc2504c2d371", 494, "RUB", 1, false, 2000);
+
+        //mosin carbine rear sight
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfd4c980db834001b73449d", "5c0647fdd443bc2504c2d371", 840, "RUB", 1, false, 2000);
+
+        //burris fullfield tac30 1-4x24 riflescope
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5b2388675acfc4771e1be0be", "hideout", "hideout", [[{
+                        "count": 2,
+                        "_tpl": "5d40407c86f774318526545a"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 1, false, 2000, 1);
+
+        //vomz pilad 4x32 riflescope
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dff772da3651922b360bf91", "5c0647fdd443bc2504c2d371", 15192, "RUB", 1, false, 5000, 5);
+
+        //kiba arms international sprm rail mount for pump-action shotguns
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "55d48a634bdc2d8b2f8b456a", "hideout", "hideout", [[{
+                        "count": 1,
+                        "_tpl": "57347b8b24597737dd42e192"
+                    }, {
+                        "count": 1,
+                        "_tpl": "573475fb24597737fb1379e1"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 1, false, 3000, 4);
+
+        //op-sks dovetail mount
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "587e08ee245977446b4410cf", "5c0647fdd443bc2504c2d371", 6318, "RUB", 1, false, 15000);
+
+        //30mm scope mount
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "57c69dd424597774c03b7bbc", "hideout", "hideout", [[{
+                        "count": 1,
+                        "_tpl": "5c13cef886f774072e618e82"
+                    }, {
+                        "count": 1,
+                        "_tpl": "59148f8286f7741b951ea113"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 1, false, 20000, 4);
+
+        //axion kobra dovetail mount
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "591ee00d86f774592f7b841e", "5c0647fdd443bc2504c2d371", 5568, "RUB", 1, false, 50000);
+
+        //armasight vulcan universal base
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b3b6dc75acfc47a8773fb1e", "5c0647fdd443bc2504c2d371", 2644, "RUB", 1, false, 2000);
+
+        //toz-106 dovetail mount
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c6162682e22160010261a2b", "5c0647fdd443bc2504c2d371", 1155, "RUB", 1, false, 2000);
+
+        //toz-106 scope mount
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c61627a2e22160012542c55", "5c0647fdd443bc2504c2d371", 2415, "RUB", 1, false, 2000);
+
+        //mosin arbalet patriot k+w rail mount
+        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);
+
+        //etmi-019 shotgun rail mount
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dfe14f30b92095fd441edaf", "5c0647fdd443bc2504c2d371", 2100, "RUB", 1, false, 2000);
+
+        //utg 25mm ring mount
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5dff77c759400025ea5150cf", "5c0647fdd443bc2504c2d371", 1733, "RUB", 1, false, 20000, 5);
+
+        //vpo-102 arbalet mount
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "609a4b4fe2ff132951242d04", "5c0647fdd443bc2504c2d371", 3048, "RUB", 1, false, 5000, 5);
+
+        //mp-133/153 plastic pistol grip
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "56083a334bdc2dc8488b4571", "5c0647fdd443bc2504c2d371", 6836, "RUB", 1, false, 10000, 3);
+
+        //mp-133/153 wooden stock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "56083cba4bdc2de22e8b456f", "5c0647fdd443bc2504c2d371", 1574, "RUB", 1, false, 2000, 5);
+
+        //sok-12 ak-style stock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "57616ca52459773c69055192", "5c0647fdd443bc2504c2d371", 1745, "RUB", 1, false, 50000);
+
+        //vpo-209 wooden stock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e89d0986f77427600d226e", "5c0647fdd443bc2504c2d371", 1911, "RUB", 1, false, 2000);
+
+        //mc 20-01 stock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5adf23995acfc400185c2aeb", "5c0647fdd443bc2504c2d371", 2576, "RUB", 1, false, 2000);
+
+        //mosin sniper carbine stock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfd37c80db834001d23e842", "5c0647fdd443bc2504c2d371", 3759, "RUB", 1, false, 2000);
+
+        //mosin carbine stock
+        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);
+
+        //mp-133 12ga 660mm barrel with rib
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "560837154bdc2da74d8b4568", "5c0647fdd443bc2504c2d371", 5777, "RUB", 1, false, 10000);
+
+        //sok-12 polymer handguard (sb.7-1)
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "576169e62459773c69055191", "5c0647fdd443bc2504c2d371", 1467, "RUB", 1, false, 70000);
+
+        //vpo-209 wooden handguard
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e898ee86f77427614bd225", "5c0647fdd443bc2504c2d371", 853, "RUB", 1, false, 2000);
+
+        //mp-133 12ga 710mm barrel
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5608373c4bdc2dc8488b4570", "5c0647fdd443bc2504c2d371", 6430, "RUB", 1, false, 10000);
+
+        //mp-133 12ga 710mm barrel with rib
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "560837544bdc2de22e8b456e", "5c0647fdd443bc2504c2d371", 7306, "RUB", 1, false, 10000);
+
+        //mp-133 12ga 750mm barrel
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "560837824bdc2d57468b4568", "5c0647fdd443bc2504c2d371", 7416, "RUB", 1, false, 10000);
+
+        //mp-133 12ga 750mm barrel with rib
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5608379a4bdc2d26448b4569", "5c0647fdd443bc2504c2d371", 8064, "RUB", 1, false, 50000);
+
+        //mp-153 12ga 750mm barrel
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "56deec93d2720bec348b4568", "5c0647fdd443bc2504c2d371", 8000, "RUB", 1, false, 10000);
+
+        //mp-153 12ga 710mm barrel
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "588200cf2459774414733d55", "5c0647fdd443bc2504c2d371", 7856, "RUB", 1, false, 10000);
+
+        //mosin 7.62x54r 514mm carbine barrel
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfd4cbe0db834001b73449f", "5c0647fdd443bc2504c2d371", 4116, "RUB", 1, false, 2000);
+
+        //sok-12 dust cover (sb.0-2)
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "57616c112459773cce774d66", "5c0647fdd443bc2504c2d371", 1255, "RUB", 1, false, 2000);
+
+        //simonov op-sks 7.6x39 semi-automatic carbine (hunting rifle version)
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "59dcdbb386f77417b03f350d", "5c0647fdd443bc2504c2d371", 33197, "RUB", 1, true, 999999);
+
+        //vpo-101 vepr hunter 7.62x51 carbine (NOT A PRESET, JUST LOWER)
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5c501a4d2e221602b412b540", "hideout", "hideout", [[{
+                        "count": 2,
+                        "_tpl": "5c501a4d2e221602b412b540"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 1, false, 2000, 2);
+
+        //molot vpo-209 .366 tkm carbine
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "59ef247086f77439967a900a", "5c0647fdd443bc2504c2d371", 32333, "RUB", 1, false, 2000, 3);
+
+        //eye mk.2 professional hand-held compass
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f4f9eb969cdc30ff33f09db", "5c0647fdd443bc2504c2d371", 203506, "RUB", 1, true, 999999, 1);
+
+        //toz-106 20ga bolt-action shotgun
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5a3a859786f7747e2305e8bf", "5c0647fdd443bc2504c2d371", 7080, "RUB", 1, true, 999999);
+
+        //dogtag case
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5c093e3486f77430cb02e593", "hideout", "hideout", [[{
+                        "count": 3,
+                        "_tpl": "590c621186f774138d11ea29"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 1, false, 500, 1);
+
+        //mp-133 12ga pump-action shotgun
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "584148f2245977598f1ad387", "5c0647fdd443bc2504c2d371", 23869, "RUB", 1, false, 200000);
+
+        //mossberg 590a1 12ga pump-action shotgun
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5f06d6bb4010601e3232cd22", "5c0647fdd443bc2504c2d371", 31610, "RUB", 1, false, 200000, 10);
+
+        //mp-153 12ga semi-automatic shotgun
+        CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "58414907245977598f1ad38d", "hideout", "hideout", [[{
+                        "count": 2,
+                        "_tpl": "590c311186f77424d1667482"
+                    }, {
+                        "count": 2,
+                        "_tpl": "590c2d8786f774245b1f03f3"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 1, false, 2000, 3);
+
+        //metal fuel tank
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5d1b36a186f7742523398433", "hideout", "hideout", [[{
+                        "count": 12,
+                        "_tpl": "57347b8b24597737dd42e192"
+                    }, {
+                        "count": 5,
+                        "_tpl": "5e2af2bc86f7746d3f3c33fc"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 1, false, 500, 1);
+
+        //molot vpo-215 .366 tkm bolt-action rifle
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5e0359bd86f7746b243db876", "5c0647fdd443bc2504c2d371", 18585, "RUB", 1, true, 999999);
+
+        //scav vest
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "572b7adb24597762ae139821", "hideout", "hideout", [[{
+                        "count": 1,
+                        "_tpl": "544fb6cc4bdc2d34748b456e"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 1, true, 999999);
+
+        //Umka М33-SET1 hunter vest
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "6034cf5fffd42c541047f72e", "5c0647fdd443bc2504c2d371", 26985, "RUB", 1, true, 999999, 3);
+
+        //vkbo army bag
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5ab8ee7786f7742d8f33f0b9", "hideout", "hideout", [[{
+                        "count": 1,
+                        "_tpl": "5c13cd2486f774072c757944"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 1, true, 999999, 3);
+
     }
     static GenerateLL2() {
         const CoreMod = require("../../CoreMod/src/Core.js");
+
+        //5.45x39mm sp
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "56dff421d2720b5f5a8b4567", "5c0647fdd443bc2504c2d371", 63, "RUB", 2, false, 40000, 400);
+
+        //.366 TKM geksa
+        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);
+
+        //12/70 "poleva-6u" slug
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e689ca4b9361bc8618956", "5c0647fdd443bc2504c2d371", 72, "RUB", 2, false, 200000, 500);
+
+        //12/70 ftx custom lite slug
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e68e6a4b9361c140bcfe0", "5c0647fdd443bc2504c2d371", 75, "RUB", 2, false, 200000, 200);
+
+        //20/70 6.2mm buckshot
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e69b9a4b9361bc8618958", "5c0647fdd443bc2504c2d371", 32, "RUB", 2, false, 200000, 200);
+
+        //20/70 7.3mm buckshot
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d6e69c7a4b9360b6c0d54e4", "5c0647fdd443bc2504c2d371", 40, "RUB", 2, false, 200000, 200);
+
+        //7.62x51mm bcp fmj
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e023e53d4353e3302577c4c", "5c0647fdd443bc2504c2d371", 158, "RUB", 2, true, 999999);
+
+        //sok-12 12/76 sai-02 10-round magazine
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a966f51a2750c00156aacf6", "5c0647fdd443bc2504c2d371", 3885, "RUB", 2, true, 999999);
+
+        //vpo-101 vepr hunter 7.62x51 5-round magazine
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c503ac82e221602b21d6e9a", "5c0647fdd443bc2504c2d371", 1155, "RUB", 2, false, 20000, 15);
+
+        //mp-133 12ga 8-shell magazine
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d485804bdc2d8c2f8b456b", "5c0647fdd443bc2504c2d371", 2410, "RUB", 2, false, 6000, 4);
+
+        //mp-153 12ga 7-shell magazine extension
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5882163224597757561aa920", "5c0647fdd443bc2504c2d371", 1747, "RUB", 2, false, 15000);
+
+        //toz-106 20ga mc 20-01 sb.3 5-shot magazine
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c6161fb2e221600113fbde5", "5c0647fdd443bc2504c2d371", 1481, "RUB", 2, false, 2000);
+
+        //mp-155 ultima underbarrel mount
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "606f26752535c57a13424d22", "5c0647fdd443bc2504c2d371", 1865, "RUB", 2, false, 2000, 3);
+
+        //mp-155 ultima pistol grip rubber pad
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "60785c0d232e5a31c233d51c", "5c0647fdd443bc2504c2d371", 1550, "RUB", 2, false, 2000, 3);
+
+        //МP-155 6-round magazine extension
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "6076c87f232e5a31c233d50e", "5c0647fdd443bc2504c2d371", 1283, "RUB", 2, false, 2000, 5);
+
+        //cms kit
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d02778e86f774203e7dedbe", "5c0647fdd443bc2504c2d371", 33075, "RUB", 2, false, 2000, 3);
+
+        //surv12 field surgical kit
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5d02797c86f774203f38e30a", "hideout", "hideout", [[{
+                        "count": 1,
+                        "_tpl": "590de7e986f7741b096e5f32"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 2, false, 2000, 1);
+
+        //gk-02 12ga muzzle brake
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "58272d7f2459774f6311ddfd", "5c0647fdd443bc2504c2d371", 4249, "RUB", 2, false, 200);
+
+        //mosin weapon tuning thread adapter
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf67a1bd7f00c06585fb6f3", "5c0647fdd443bc2504c2d371", 1995, "RUB", 2, false, 2000);
+
+        //grizzly medical kit
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "590c657e86f77412b013051d", "hideout", "hideout", [[{
+                        "count": 1,
+                        "_tpl": "59e3647686f774176a362507"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 2, false, 2000, 2);
+
+        //sks 7.62x39 weapon tuning thread adapter
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf67cadd7f00c065a5abab7", "5c0647fdd443bc2504c2d371", 1943, "RUB", 2, false, 2000);
+
+        //mosin tiger rock thread adapter
+        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);
+
+        //nightforce atacr 7-35x56 riflescope
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa66be6e5b5b0214e506e97", "hideout", "hideout", [[{
+                        "count": 1,
+                        "_tpl": "5af0561e86f7745f5f3ad6ac"
+                    }, {
+                        "count": 2,
+                        "_tpl": "590a391c86f774385a33c404"
+                    }, {
+                        "count": 1,
+                        "_tpl": "590a3d9c86f774385926e510"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 2, false, 1000, 3);
+
+        //burris fullfield tac30 1-4x24 riflescope
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5b2388675acfc4771e1be0be", "5c0647fdd443bc2504c2d371", 33042, "RUB", 2, false, 2000);
+
+        //kiba arms international sprm rail mount for pump-action shotguns
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d48a634bdc2d8b2f8b456a", "5c0647fdd443bc2504c2d371", 3450, "RUB", 2, false, 15000, 5);
+
+        //delta-tek sprut mount for pump-action shotguns
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d48ebc4bdc2d8c2f8b456c", "5c0647fdd443bc2504c2d371", 2718, "RUB", 2, false, 15000);
+
+        //pilad 043-02 dovetail mount
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "57acb6222459771ec34b5cb0", "5c0647fdd443bc2504c2d371", 5374, "RUB", 2, false, 15000);
+
+        //30mm scope mount
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "57c69dd424597774c03b7bbc", "5c0647fdd443bc2504c2d371", 4291, "RUB", 2, false, 15000);
+
+        //sks utg socom rail mount
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "593d1fa786f7746da62d61ac", "5c0647fdd443bc2504c2d371", 12568, "RUB", 2, false, 15000);
+
+        //unv dloc-ird sight mount
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5a1ead28fcdbcb001912fa9f", "hideout", "hideout", [[{
+                        "count": 4,
+                        "_tpl": "5672cb304bdc2dc2088b456a"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 2, false, 5000, 4);
+
+        //nightforce magmount 34mm rings
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5aa66a9be5b5b0214e506e89", "hideout", "hideout", [[{
+                        "count": 1,
+                        "_tpl": "59fafb5d86f774067a6f2084"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 2, false, 2000);
+
+        //mosin sawn-off stock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfd36ad0db834001c38ef66", "5c0647fdd443bc2504c2d371", 1680, "RUB", 2, false, 2000);
+
+        //toz-106 custom cut mosin stock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c99f3592e221644fc633070", "5c0647fdd443bc2504c2d371", 5093, "RUB", 2, false, 2000);
+
+        //mp-155 ultima polymer stock (stock)
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "606eef756d0bd7580617baf8", "5c0647fdd443bc2504c2d371", 3451, "RUB", 2, false, 2000, 3);
+
+        //vpo-101 vepr hunter svd-style stock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5f63405df5750b524b45f114", "5c0647fdd443bc2504c2d371", 5670, "RUB", 2, false, 20000, 5);
+
+        //mp-155 walnut stock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "607d5a891246154cad35d6aa", "5c0647fdd443bc2504c2d371", 1364, "RUB", 2, false, 2000, 5);
+
+        //mp-133 12ga 610mm barrel
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d448594bdc2d8c2f8b4569", "5c0647fdd443bc2504c2d371", 5148, "RUB", 2, false, 10000);
+
+        //mp-133 12ga 610mm barrel with rib
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d449444bdc2d962f8b456d", "5c0647fdd443bc2504c2d371", 5359, "RUB", 2, false, 10000);
+
+        //mp-133 12ga 540mm barrel
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "560836484bdc2d20478b456e", "5c0647fdd443bc2504c2d371", 4095, "RUB", 2, false, 2000);
+
+        //mp-133 12ga 540mm barrel with rib
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "560836b64bdc2d57468b4567", "5c0647fdd443bc2504c2d371", 4410, "RUB", 2, false, 2000);
+
+        //mp-153 12ga 660mm barrel
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "588200c224597743990da9ed", "5c0647fdd443bc2504c2d371", 7538, "RUB", 2, false, 2000);
+
+        //mosin 7.62x54r sawn-off 200mm barrel
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfd4cc90db834001d23e846", "5c0647fdd443bc2504c2d371", 2205, "RUB", 2, false, 2000);
+
+        //mp-155 510mm barrel
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "6076c1b9f2cb2e02a42acedc", "5c0647fdd443bc2504c2d371", 7357, "RUB", 2, false, 2000, 5);
+
+        //pack of sugar
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "59e3577886f774176a362503", "hideout", "hideout", [[{
+                        "count": 5,
+                        "_tpl": "5751487e245977207e26a315"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 2, false, 2000, 1);
+
+        //mp-133 custom plastic forestock with rails
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "55d45f484bdc2d972f8b456d", "5c0647fdd443bc2504c2d371", 9608, "RUB", 2, false, 7968);
+
+        //mp-155 ultima polymer stock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "606ee5c81246154cad35d65e", "5c0647fdd443bc2504c2d371", 4608, "RUB", 2, false, 2000, 3);
+
+        //mp-155 walnut forestock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "607d5aa50494a626335e12ed", "5c0647fdd443bc2504c2d371", 1921, "RUB", 2, false, 2000, 5);
+
+        //mp-155 ultima pistol grip
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "606eef46232e5a31c233d500", "5c0647fdd443bc2504c2d371", 2739, "RUB", 2, false, 2000, 3);
+
+        //factory emergency exit key
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5448ba0b4bdc2d02308b456c", "hideout", "hideout", [[{
+                        "count": 1,
+                        "_tpl": "5448ba0b4bdc2d02308b456c"
+                    }, {
+                        "count": 4,
+                        "_tpl": "590c5d4b86f774784e1b9c45"
+                    }, {
+                        "count": 1,
+                        "_tpl": "590c5f0d86f77413997acfab"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 2, false, 2000, 1);
+
+        //military checkpoint key
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5913915886f774123603c392", "hideout", "hideout", [[{
+                        "count": 2,
+                        "_tpl": "590c639286f774151567fa95"
+                    }, {
+                        "count": 4,
+                        "_tpl": "5d40407c86f774318526545a"
+                    }, {
+                        "count": 2,
+                        "_tpl": "57347d7224597744596b4e72"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 2, false, 50, 1);
+
+        //vpo-101 vepr hunter 7.62x51 carbine
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "5c98bf9186f7740cf708c509", "5c0647fdd443bc2504c2d371", 48302, "RUB", 2, false, 20000, 3);
+
+        //mp-155 12ga semi-automatic shotgun
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "60b7c28ee53e4c5c8945dd73", "5c0647fdd443bc2504c2d371", 34945, "RUB", 2, true, 999999);
+
+        //mp-153 12ga semi-automatic shotgun
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "58414907245977598f1ad38d", "5c0647fdd443bc2504c2d371", 29431, "RUB", 2, false, 50000);
+
+        //saiga 12ga ver 10 12/76 semi-automatic shotgun
+        CoreMod.CreateTraderAssortWithPreset(HashUtil.generate(), "58414a052459775a2b6d9f1e", "5c0647fdd443bc2504c2d371", 25572, "RUB", 2, false, 25000);
+
+        //remington model 700 .308 bolt-action sniper rifle
+        CoreMod.CreateTraderBarterWithPreset(HashUtil.generate(), "5c0c1d6586f7743e5335d264", "hideout", "hideout", [[{
+                        "count": 1,
+                        "_tpl": "5bc9b9ecd4351e3bac122519"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 2, false, 2000, 1);
+
+        //metal fuel tank
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d1b36a186f7742523398433", "5c0647fdd443bc2504c2d371", 166824, "RUB", 2, false, 10000, 1);
+
+        //mr. holodilnick thermal bag
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5c093db286f7740a1b2617e3", "hideout", "hideout", [[{
+                        "count": 10,
+                        "_tpl": "5751496424597720a27126da"
+                    }, {
+                        "count": 5,
+                        "_tpl": "57514643245977207f2c2d09"
+                    }, {
+                        "count": 5,
+                        "_tpl": "57347d9c245977448b40fa85"
+                    }, {
+                        "count": 5,
+                        "_tpl": "57347d8724597744596b4e76"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 2, false, 20000);
+
+        //6b5-15 zh-86 "uley" armored rig
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5c0e446786f7742013381639", "hideout", "hideout", [[{
+                        "count": 3,
+                        "_tpl": "5c13cd2486f774072c757944"
+                    }, {
+                        "count": 1,
+                        "_tpl": "5c13cef886f774072e618e82"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 2, false, 15000, 1);
+
+        //splav tarzan m22 chest rig
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5e4abfed86f77406a2713cf7", "hideout", "hideout", [[{
+                        "count": 1,
+                        "_tpl": "5e2af2bc86f7746d3f3c33fc"
+                    }
+                ]], "5c0647fdd443bc2504c2d371", 2, false, 20000, 2);
+
     }
     static GenerateLL3() {
         const CoreMod = require("../../CoreMod/src/Core.js");
@@ -139,7 +715,7 @@ class JeagerAssort {
         //mp-153 12ga 610mm barrel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "588200af24597742fa221dfb", "5c0647fdd443bc2504c2d371", 7539, "RUB", 3, false, 7000);
 
-        //mp-155 ultima polymer stock
+        //mp-155 ultima polymer stock (handguard)
         CoreMod.CreateTraderAssort(HashUtil.generate(), "606ee5c81246154cad35d65e", "5c0647fdd443bc2504c2d371", 4608, "RUB", 3, false, 2000);
 
         //goshan cash register key
diff --git a/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js b/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js
index 2eac11e..e2bccf2 100644
--- a/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js
+++ b/Ereshkigal-BaseAssortGenerator/src/peacekeeper.js
@@ -220,7 +220,7 @@ class PeacekeeperAssort {
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cc80f8fe4a949033b0224a2", "5935c25fb3acc3127c3d8cd9", 2, "USD", 2, false, 200000, 300);
 
         //.45 ACP Lasermatch FMJ
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5efb0d4f4bc50b58e81710f3", "5935c25fb3acc3127c3d8cd9", 1, "USD", 2, false, 600000, 300);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5efb0d4f4bc50b58e81710f3", "5935c25fb3acc3127c3d8cd9", 2, "USD", 2, false, 600000, 300);
 
         //9x19 Quakemaker
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5efb0e16aeb21837e749c7ff", "5935c25fb3acc3127c3d8cd9", 2, "USD", 2, false, 500000, 200);
@@ -251,6 +251,15 @@ class PeacekeeperAssort {
 
         //MP9 9x19 20-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5de8ea8ffd6b4e6e2276dc35", "5935c25fb3acc3127c3d8cd9", 19, "USD", 2, false, 10000, 10);
+		
+		//MP9 9x19 30-round magazine
+        CoreMod.CreateTraderBarter(HashUtil.generate(), "5de8eac42a78646d96665d91", "hideout", "hideout", [
+                [{
+                        "count": 1,
+                        "_tpl": "590a3efd86f77437d351a25b"
+                    }
+                ]
+            ], "5935c25fb3acc3127c3d8cd9", 2, false, 20000, 3);
 
         //KAC 7.62x51 10-round steel magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5df8f535bb49d91fb446d6b0", "5935c25fb3acc3127c3d8cd9", 18, "USD", 2, false, 20000, 10);
@@ -432,36 +441,6 @@ class PeacekeeperAssort {
         //MP5SD upper receiver
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5926f2e086f7745aae644231", "5935c25fb3acc3127c3d8cd9", 76, "USD", 2, false, 15000, 8);
 
-        //Wilcox Skull Lock head mount
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a16bb52fcdbcb001a3b00dc", "5935c25fb3acc3127c3d8cd9", 1133, "USD", 2, false, 20000);
-
-        //UNTAR helmet
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa7d03ae5b5b00016327db5", "5935c25fb3acc3127c3d8cd9", 206, "USD", 2, false, 20000, 5);
-
-        //MSA ACH TC-2001 MICH Series helmet
-        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);
-
-        //SOE Micro Rig
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d5d8ca986f7742798716522", "5935c25fb3acc3127c3d8cd9", 93, "USD", 2, false, 20000, 5);
-
-        //MF-UNTAR body armor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ab8e4ed86f7742d8e50c7fa", "5935c25fb3acc3127c3d8cd9", 386, "USD", 2, true, 999999, 6);
-
-        //LBT-8005A Day Pack backpack
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e9dcf5986f7746c417435b3", "5935c25fb3acc3127c3d8cd9", 218, "USD", 2, false, 5000, 2);
-
-        //MP9 9x19 30-round magazine
-        CoreMod.CreateTraderBarter(HashUtil.generate(), "5de8eac42a78646d96665d91", "hideout", "hideout", [
-                [{
-                        "count": 1,
-                        "_tpl": "590a3efd86f77437d351a25b"
-                    }
-                ]
-            ], "5935c25fb3acc3127c3d8cd9", 2, false, 2000, 3);
-
         //KAC QDC 5.56x45 flash suppressor kit
         CoreMod.CreateTraderBarter(HashUtil.generate(), "56ea8180d2720bf2698b456a", "hideout", "hideout", [
                 [{
@@ -546,30 +525,90 @@ class PeacekeeperAssort {
         //RFB
         id = HashUtil.generate();
         CoreMod.CreateTraderAssortWithPreset(id, "5f676b779ab5ec19f028eaf3", "5935c25fb3acc3127c3d8cd9", 481, "USD", 2, false, 20000, 5);
+		
+		//ds arms sa-58 7.62x51 assault rifle preset
+		CoreMod.CreateTraderBarterWithPreset(id, "5b439b5686f77428bd137424", "hideout", "hideout", [
+		[{
+				"count": 3,
+				"_tpl": "590a386e86f77429692b27ab"
+			},{
+				"count": 2,
+				"_tpl": "57347baf24597738002c6178"
+			}
+		]
+		], "5935c25fb3acc3127c3d8cd9", 2, false, 2000, 1);
+		
+		//fn five-seven mk2 5.7x28 pistol (flat dark earth) preset
+		CoreMod.CreateTraderBarterWithPreset(id, "5b439b5686f77428bd137424", "hideout", "hideout", [
+		[{
+				"count": 1,
+				"_tpl": "5d03784a86f774203e7e0c4d"
+			}
+		]
+		], "5935c25fb3acc3127c3d8cd9", 2, false, 2000, 3);
 
         //P226R
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "584149242459775a7726350a", "5935c25fb3acc3127c3d8cd9", 132, "USD", 2, false, 15000, 2);
+        CoreMod.CreateTraderAssortWithPreset(id, "584149242459775a7726350a", "5935c25fb3acc3127c3d8cd9", 133, "USD", 2, false, 15000, 2);
 
         //M1911
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5eb2968186f7746d1f1a4fd5", "5935c25fb3acc3127c3d8cd9", 138, "USD", 2, false, 200000, 3);
+        CoreMod.CreateTraderAssortWithPreset(id, "5eb2968186f7746d1f1a4fd5", "5935c25fb3acc3127c3d8cd9", 139, "USD", 2, false, 200000, 3);
 
         //MPX
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "58dffca786f774083a256ab1", "5935c25fb3acc3127c3d8cd9", 390, "USD", 2, false, 15000, 2);
+        CoreMod.CreateTraderAssortWithPreset(id, "58dffca786f774083a256ab1", "5935c25fb3acc3127c3d8cd9", 393, "USD", 2, false, 15000, 2);
 
-        //MP5
+        //hk MP5 (navy 3 round burst)
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "59411aa786f7747aeb37f9a5", "5935c25fb3acc3127c3d8cd9", 311, "USD", 2, true, 999999);
+        CoreMod.CreateTraderAssortWithPreset(id, "59411aa786f7747aeb37f9a5", "5935c25fb3acc3127c3d8cd9", 313, "USD", 2, true, 999999);
 
         //MP9
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5e0340ab86f7745bb7339235", "5935c25fb3acc3127c3d8cd9", 273, "USD", 2, false, 20000, 3);
+        CoreMod.CreateTraderAssortWithPreset(id, "5e0340ab86f7745bb7339235", "5935c25fb3acc3127c3d8cd9", 275, "USD", 2, false, 20000, 3);
 
         //UMP 45
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5fd2517dbdd50d684f73a474", "5935c25fb3acc3127c3d8cd9", 274, "USD", 2, false, 200000, 7);
+        CoreMod.CreateTraderAssortWithPreset(id, "5fd2517dbdd50d684f73a474", "5935c25fb3acc3127c3d8cd9", 276, "USD", 2, false, 200000, 7);
+		
+		//Wilcox Skull Lock head mount
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5a16bb52fcdbcb001a3b00dc", "5935c25fb3acc3127c3d8cd9", 1133, "USD", 2, false, 20000);
+
+        //UNTAR helmet
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa7d03ae5b5b00016327db5", "5935c25fb3acc3127c3d8cd9", 206, "USD", 2, false, 20000, 5);
+
+        //MSA ACH TC-2001 MICH Series helmet
+        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);
+		
+		//Secure container beta
+		CoreMod.CreateTraderBarter(id, "5857a8b324597729ab0a0e7d", "hideout", "hideout", [
+		[{
+				"count": 1,
+				"_tpl": "5d03794386f77420415576f5"
+			},{
+				"count": 3,
+				"_tpl": "5d0377ce86f774186372f689"
+			},{
+				"count": 2,
+				"_tpl": "5c05308086f7746b2101e90b"
+			},{
+				"count": 3,
+				"_tpl": "5d0375ff86f774186372f685"
+			}
+		]
+		], "5935c25fb3acc3127c3d8cd9", 2, false, 200, 1);
+
+        //SOE Micro Rig
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5d5d8ca986f7742798716522", "5935c25fb3acc3127c3d8cd9", 93, "USD", 2, false, 20000, 5);
+
+        //MF-UNTAR body armor
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ab8e4ed86f7742d8e50c7fa", "5935c25fb3acc3127c3d8cd9", 386, "USD", 2, true, 999999, 6);
+
+        //LBT-8005A Day Pack backpack
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e9dcf5986f7746c417435b3", "5935c25fb3acc3127c3d8cd9", 218, "USD", 2, false, 5000, 2);
 
     }
     static GenerateLL3() {
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() {
diff --git a/Ereshkigal-BaseAssortGenerator/src/ragman.js b/Ereshkigal-BaseAssortGenerator/src/ragman.js
index 35546e1..71dcbc2 100644
--- a/Ereshkigal-BaseAssortGenerator/src/ragman.js
+++ b/Ereshkigal-BaseAssortGenerator/src/ragman.js
@@ -40,7 +40,7 @@ class RagmanAssort{
                 ]], "5ac3b934156ae10c4430e83c", 1, false, 2000);
 
         //tactical glasses
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "557ff21e4bdc2d89578b4586", "5ac3b934156ae10c4430e83c", 1853, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "557ff21e4bdc2d89578b4586", "5ac3b934156ae10c4430e83c", 1853, "RUB", 1, true, 999999, 4);
 
         //dundukk sport sunglasses
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa2b986e5b5b00014028f4c", "5ac3b934156ae10c4430e83c", 2252, "RUB", 1, false, 10000);
@@ -50,17 +50,17 @@ class RagmanAssort{
                         "count": 2,
                         "_tpl": "573474f924597738002c6174"
                     }
-                ]], "5ac3b934156ae10c4430e83c", 1, false, 2000);
+                ]], "5ac3b934156ae10c4430e83c", 1, false, 2000, 1);
 
         //kolpak-1S riot helmet
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e7711e86f7746cae05fbe1", "5ac3b934156ae10c4430e83c", 8137, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "59e7711e86f7746cae05fbe1", "5ac3b934156ae10c4430e83c", 8137, "RUB", 1, true, 999999, 5);
 
         //6b47 ratnik-bsh helmet
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5a7c4850e899ef00150be885", "hideout", "hideout", [[{
                         "count": 2,
                         "_tpl": "59e3556c86f7741776641ac2"
                     }
-                ]], "5ac3b934156ae10c4430e83c", 1, false, 6000);
+                ]], "5ac3b934156ae10c4430e83c", 1, false, 6000, 4);
 
         //usec baseball cap
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa2a7e8e5b5b00016327c16", "5ac3b934156ae10c4430e83c", 1823, "RUB", 1, false, 20000);
@@ -69,7 +69,7 @@ class RagmanAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5aa2b87de5b5b00016327c25", "5ac3b934156ae10c4430e83c", 1916, "RUB", 1, false, 20000);
 
         //ssh-68 steel helmet
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c06c6a80db834001b735491", "5ac3b934156ae10c4430e83c", 22456, "RUB", 1, true, 9999);
+        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);
@@ -88,46 +88,46 @@ class RagmanAssort{
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e3eb886f7742015526062", "5ac3b934156ae10c4430e83c", 49751, "RUB", 1, false, 2000);
 
         //spiritus systems bank robber chest rig
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e4abc1f86f774069619fbaa", "5ac3b934156ae10c4430e83c", 10013, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5e4abc1f86f774069619fbaa", "5ac3b934156ae10c4430e83c", 10013, "RUB", 1, true, 999999, 4);
 
         //csa chest rig
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "6034d0230ca681766b6a0fb5", "5ac3b934156ae10c4430e83c", 20979, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "6034d0230ca681766b6a0fb5", "5ac3b934156ae10c4430e83c", 20979, "RUB", 1, true, 999999);
 
         //paca soft armor
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5648a7494bdc2d9d488b4583", "hideout", "hideout", [[{
                         "count": 3,
                         "_tpl": "572b7fa524597762b747ce82"
                     }
-                ]], "5ac3b934156ae10c4430e83c", 1, false, 7000);
+                ]], "5ac3b934156ae10c4430e83c", 1, false, 7000, 3);
 
         //paca soft armor
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5648a7494bdc2d9d488b4583", "5ac3b934156ae10c4430e83c", 29154, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5648a7494bdc2d9d488b4583", "5ac3b934156ae10c4430e83c", 29154, "RUB", 1, true, 999999, 4);
 
         //mf-untar body armor
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5ab8e4ed86f7742d8e50c7fa", "hideout", "hideout", [[{
                         "count": 3,
                         "_tpl": "5751435d24597720a27126d1"
                     }
-                ]], "5ac3b934156ae10c4430e83c", 1, false, 2000);
+                ]], "5ac3b934156ae10c4430e83c", 1, false, 2000, 1);
 
         //6b2 armor (flora)
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5df8a2ca86f7740bfe6df777", "5ac3b934156ae10c4430e83c", 27079, "RUB", 1, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5df8a2ca86f7740bfe6df777", "5ac3b934156ae10c4430e83c", 27079, "RUB", 1, false, 20000, 3);
 
         //flyye mbss backpack
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "544a5cde4bdc2d39388b456b", "5ac3b934156ae10c4430e83c", 12496, "RUB", 1, false, 200000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "544a5cde4bdc2d39388b456b", "5ac3b934156ae10c4430e83c", 12496, "RUB", 1, false, 200000, 5);
 
         //tactical sling bag
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ab8f04f86f774585f4237d8", "5ac3b934156ae10c4430e83c", 2046, "RUB", 1, true, 9999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ab8f04f86f774585f4237d8", "5ac3b934156ae10c4430e83c", 2046, "RUB", 1, true, 999999);
 
         //wartech berkut bb-102 backpack
         CoreMod.CreateTraderBarter(HashUtil.generate(), "5ca20d5986f774331e7c9602", "hideout", "hideout", [[{
                         "count": 1,
                         "_tpl": "572b7fa524597762b747ce82"
                     }
-                ]], "5ac3b934156ae10c4430e83c", 1, false, 10000);
+                ]], "5ac3b934156ae10c4430e83c", 1, false, 10000, 3);
 
         //wartech berkut bb-102 backpack
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ca20d5986f774331e7c9602", "5ac3b934156ae10c4430e83c", 23444, "RUB", 1, false, 20000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5ca20d5986f774331e7c9602", "5ac3b934156ae10c4430e83c", 23444, "RUB", 1, false, 20000, 3);
 
     }
     static GenerateLL2() {
diff --git a/Ereshkigal-BaseAssortGenerator/src/skier.js b/Ereshkigal-BaseAssortGenerator/src/skier.js
index f6a216e..a4cf21e 100644
--- a/Ereshkigal-BaseAssortGenerator/src/skier.js
+++ b/Ereshkigal-BaseAssortGenerator/src/skier.js
@@ -192,6 +192,9 @@ class SkierAssort {
     static GenerateLL2() {
         const CoreMod = require("../../CoreMod/src/Core.js");
         let id = null;
+		
+		//.300 aac blackout bcp fmj
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbe3ffdf8b6a877a729ea82", "58330581ace78e27b8b10cee", 91, "RUB", 3, false, 700000, 500);
 
         //DVL-10 Mag
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5888988e24597752fe43a6fa", "58330581ace78e27b8b10cee", 5167, "RUB", 2, false, 15000);
@@ -203,7 +206,20 @@ class SkierAssort {
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5ce69cbad7f00c00b61c5098", "58330581ace78e27b8b10cee", 3220, "RUB", 2, false, 2000);
 
         //Glock .45 ACP 13-round magazine
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb651b52b1b027b1f50bcff", "58330581ace78e27b8b10cee", 1783, "RUB", 2, true, 999999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb651b52b1b027b1f50bcff", 
+		"58330581ace78e27b8b10cee", 1783, "RUB", 2, true, 999999);
+		
+		//Glock .45 acp kriss g30 magex 30-round magazine
+		CoreMod.CreateTraderBarter(HashUtil.generate(), "5fb651dc85f90547f674b6f4", "hideout", "hideout", [
+                [{
+                        "count": 1,
+                        "_tpl": "5734770f24597738025ee254"
+                    }, {
+                        "count": 1,
+                        "_tpl": "5d1c819a86f774771b0acd6c"
+                    }
+                ]
+            ], "58330581ace78e27b8b10cee", 1, false, 3000, 6);
 
         //FAB Defense protection cap for AGR-870
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfe86bd0db83400232fe959", "58330581ace78e27b8b10cee", 297, "RUB", 2, false, 2000);
@@ -218,7 +234,7 @@ class SkierAssort {
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5cf4fb76d7f00c065703d3ac", "58330581ace78e27b8b10cee", 4025, "RUB", 2, false, 20000);
 
         //AK Zenit DTK-1 7.62x39 & 5.45x39 muzzle brake & compensator
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5649ab884bdc2ded0b8b457f", "58330581ace78e27b8b10cee", 4865, "RUB", 2, false, 15000);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5649ab884bdc2ded0b8b457f", "58330581ace78e27b8b10cee", 4865, "RUB", 2, false, 15000, 5);
 
         //AR-15 Surefire WarComp 5.56x45 Flash hider
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c6d710d2e22165df16b81e7", "58330581ace78e27b8b10cee", 5520, "RUB", 2, false, 2000);
@@ -231,12 +247,31 @@ class SkierAssort {
 
         //TT 7.62x25 makeshift sound suppressor
         CoreMod.CreateTraderAssort(HashUtil.generate(), "571a28e524597720b4066567", "58330581ace78e27b8b10cee", 17140, "RUB", 2, false, 2000, 3);
-
-        //OKP-7 Reflex sight
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "570fd79bd2720bc7458b4583", "58330581ace78e27b8b10cee", 16885, "RUB", 2, false, 5000, 4);
+		
+		// hexagon 12k 12ga sound suppressor
+		CoreMod.CreateTraderBarter(HashUtil.generate(), "59c0ec5b86f77435b128bfca", "hideout", "hideout", [
+                [{
+                        "count": 1,
+                        "_tpl": "59e3647686f774176a362507"
+                    }
+                ]
+            ], "58330581ace78e27b8b10cee", 1, false, 2000, 2);
+	
+			
+		//rotor 43 9x19 muzzle brake
+		CoreMod.CreateTraderBarter(HashUtil.generate(), "5a9fb739a2750c003215717f", "hideout", "hideout", [
+                [{
+                        "count": 1,
+                        "_tpl": "5af0484c86f7740f02001f7f"
+                    }
+                ]
+            ], "58330581ace78e27b8b10cee", 1, false, 2000, 2);
 
         //Primary Arms Compact prism scope 2.5x
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c1cdd512e22161b267d91ae", "58330581ace78e27b8b10cee", 20125, "RUB", 2, false, 20000);
+		
+        //OKP-7 Reflex sight
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "570fd79bd2720bc7458b4583", "58330581ace78e27b8b10cee", 16885, "RUB", 2, false, 5000, 4);
 
         //Holosun HS401G5 reflex sight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5b30b0dc5acfc400153b7124", "58330581ace78e27b8b10cee", 17131, "RUB", 2, false, 2000, 4);
@@ -252,13 +287,13 @@ class SkierAssort {
 
         //KRISS Defiance low profile flip up front sight
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb6567747ce63734e3fa1dc", "58330581ace78e27b8b10cee", 2530, "RUB", 2, false, 20000, 5);
+		
+        //PNV-10T NV Goggles
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0696830db834001d23f5da", "58330581ace78e27b8b10cee", 32200, "RUB", 2, false, 2000, 3);
 
         //Zenit 2P Klesch flashlight + laser designator
         CoreMod.CreateTraderAssort(HashUtil.generate(), "560d657b4bdc2da74d8b4572", "58330581ace78e27b8b10cee", 18028, "RUB", 2, false, 15000);
 
-        //PNV-10T NV Goggles
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0696830db834001d23f5da", "58330581ace78e27b8b10cee", 32200, "RUB", 2, false, 2000, 3);
-
         //MP-443 B-8 mount
         CoreMod.CreateTraderAssort(HashUtil.generate(), "576a7c512459771e796e0e17", "58330581ace78e27b8b10cee", 3156, "RUB", 2, false, 15000);
 
@@ -282,19 +317,40 @@ class SkierAssort {
 
         //Zenit B-13V "Klassika" dovetail rail platform
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c90c3622e221601da359851", "58330581ace78e27b8b10cee", 8740, "RUB", 2, false, 2000, 4);
+		
+		//KRISS vector bottom rail
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbb976df9986c4cff3fe5f2", "58330581ace78e27b8b10cee", 1265, "RUB", 2, false, 20000, 5);
+		
+		//KRISS vector side rail
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5fce0f9b55375d18a253eff2", "58330581ace78e27b8b10cee", 1188, "RUB", 2, false, 20000, 5);
+		
+		//colt buffer tube
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5649be884bdc2d79388b4577", "58330581ace78e27b8b10cee", 1352, "RUB", 2, false, 12000, 8);
+		
+		// aks-74/aks-74u zenit pt lock
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "59ecc28286f7746d7a68aa8c", "58330581ace78e27b8b10cee", 3713, "RUB", 2, false, 15000, 10);
+
+		// akm/ak-74 zenit pt lock
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5b222d335acfc4771e1be099", "58330581ace78e27b8b10cee", 3668, "RUB", 2, false, 2000, 10);
+		
+		//ak zenit pt-1 "klassika" stock
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5b222d405acfc400153af4fe", "58330581ace78e27b8b10cee", 13522, "RUB", 2, false, 20000, 5);
 
         //FAB Defense buffer tube for AGR-870
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfe89510db834001808a127", "58330581ace78e27b8b10cee", 1231, "RUB", 2, false, 2000);
 
         //KRISS Vector Gen.2 folding stock
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb6558ad6f0b2136f2d7eb7", "58330581ace78e27b8b10cee", 7038, "RUB", 2, false, 20000, 5);
+		
+		//KRISS vector pistol sling adapter
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb655a72b1b027b1f50bd06", "58330581ace78e27b8b10cee", 1725, "RUB", 2, false, 2000, 4);
+
+		//FAB Defense GL-Core buttstock
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "602e620f9b513876d4338d9a", "58330581ace78e27b8b10cee", 4715, "RUB", 2, false, 10000, 4);
 
         //KRISS Vector non-folding stock adapter
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5fb655b748c711690e3a8d5a", "58330581ace78e27b8b10cee", 4485, "RUB", 2, false, 20000, 7);
 
-        //FAB Defense GL-Core buttstock
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "602e620f9b513876d4338d9a", "58330581ace78e27b8b10cee", 4715, "RUB", 2, false, 10000, 4);
-
         //TT 7.62x25 121mm homespun threaded barrel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "571a279b24597720b4066566", "58330581ace78e27b8b10cee", 2472, "RUB", 2, false, 2000, 3);
 
@@ -304,21 +360,27 @@ class SkierAssort {
         //AR-15 5.56x45 406mm barrel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c0e2f94d174af029f650d56", "58330581ace78e27b8b10cee", 18630, "RUB", 2, false, 2000, 4);
 
-        //KRISS Vector 9x19 6 inch barrel
+        //KRISS Vector 9x19 5 inch barrel
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbbc366ca32ed67276c1557", "58330581ace78e27b8b10cee", 9430, "RUB", 2, false, 20000, 5);
+		
+		//KRISS Vector 9x19 6 inch barrel
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbbc383d5cb881a7363194a", "58330581ace78e27b8b10cee", 11155, "RUB", 2, false, 20000, 5);
 
         //SOK-12 Leapers UTG PRO MTU002 Short Top aluminum handguard
         CoreMod.CreateTraderAssort(HashUtil.generate(), "58272b392459774b4c7b3ccd", "58330581ace78e27b8b10cee", 8670, "RUB", 2, false, 15000);
+		
+		// ak tdi akm-l handguard
+		CoreMod.CreateTraderAssort(HashUtil.generate(), "5d1b198cd7ad1a604869ad72", "58330581ace78e27b8b10cee", 4830, "RUB", 2, false, 2000);
 
-        //PR870 forestock
+        //m870 fab defense PR870 forestock
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5a788031c585673f2b5c1c79", "58330581ace78e27b8b10cee", 2359, "RUB", 2, false, 2000);
+		
+		//AR-15 Magpul MOE SL mid length M-LOK handguard
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c78f26f2e221601da3581d1", "58330581ace78e27b8b10cee", 12765, "RUB", 2, false, 2000);
 
         //Zenit B-10 handguard
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5c617a5f2e2216000f1e81b3", "58330581ace78e27b8b10cee", 7049, "RUB", 2, false, 25000, 5);
 
-        //AR-15 Magpul MOE SL mid length M-LOK handguard
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5c78f26f2e221601da3581d1", "58330581ace78e27b8b10cee", 12765, "RUB", 2, false, 2000);
-
         //AK TDI AKM-L handguard
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5d1b198cd7ad1a604869ad72", "58330581ace78e27b8b10cee", 4830, "RUB", 2, false, 1870);
 
@@ -329,7 +391,7 @@ class SkierAssort {
         CoreMod.CreateTraderAssort(HashUtil.generate(), "5bfe86a20db834001d23e8f7", "58330581ace78e27b8b10cee", 3300, "RUB", 2, false, 20000, 4);
 
         //Euros
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "569668774bdc2da2298b4568", "58330581ace78e27b8b10cee", 147, "RUB", 2, true, 999999);
+        CoreMod.CreateTraderAssort(HashUtil.generate(), "569668774bdc2da2298b4568", "58330581ace78e27b8b10cee", 145, "RUB", 2, true, 999999);
 
         //M870
         id = HashUtil.generate();
@@ -337,18 +399,17 @@ class SkierAssort {
 
         //Vector .45 ACP
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5fd251ee16cac650092f5d02", "58330581ace78e27b8b10cee", 86439, "RUB", 2, false, 20000, 3);
+        CoreMod.CreateTraderAssortWithPreset(id, "5fd251ee16cac650092f5d02", "58330581ace78e27b8b10cee", 89439, "RUB", 2, false, 20000, 3);
 
-        //STM-9
-        //Todo: create preset
+        //STM-9 gen.2 9x19 carbine default preset
         id = HashUtil.generate();
-        CoreMod.CreateTraderAssortWithPreset(id, "5c0c1dff86f7744dba7a2892", "58330581ace78e27b8b10cee", 44121, "RUB", 2, false, 50000, 4);
+        CoreMod.CreateTraderAssortWithPreset(id, "60479c3f420fac5ebc199f86", "58330581ace78e27b8b10cee", 44121, "RUB", 2, false, 50000, 4);
 
         //SIG MCX .300
         id = HashUtil.generate();
         CoreMod.CreateTraderBarterWithPreset(id, "5fd251a31189a17bcc172662", "hideout", "hideout", [
                 [{
-                        "count": 1,
+                        "count": 2,
                         "_tpl": "5c1265fc86f7743f896a21c2"
                     }, {
                         "count": 1,
@@ -369,9 +430,6 @@ class SkierAssort {
                 ]
             ], "58330581ace78e27b8b10cee", 3, false, 2000, 12);
 
-        //.300 aac blackout bcp fmj
-        CoreMod.CreateTraderAssort(HashUtil.generate(), "5fbe3ffdf8b6a877a729ea82", "58330581ace78e27b8b10cee", 91, "RUB", 3, false, 700000);
-
         //ak 7.62x39 molot 40-round magazine
         CoreMod.CreateTraderAssort(HashUtil.generate(), "59e5f5a486f7746c530b3ce2", "58330581ace78e27b8b10cee", 2862, "RUB", 3, false, 15000);