diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
index af30fa866..66b0ab8ad 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Ammo.hpp
@@ -1,350 +1,183 @@
-AmmoCivilian[] =
-{
-	//Pistols
-	{Loot_MAGAZINE,		5,		8Rnd_9x18_Makarov},
-	{Loot_MAGAZINE,		3,		7Rnd_45ACP_1911},
-	{Loot_MAGAZINE,		4,		6Rnd_45ACP},
-	{Loot_MAGAZINE,		1,		8Rnd_9x18_MakarovSD},
-	
-	//Rifles
-	{Loot_MAGAZINE,		3,		15Rnd_W1866_Slug},
-	{Loot_MAGAZINE,		2,		5Rnd_762x54_Mosin},
-	{Loot_MAGAZINE,		2,		10Rnd_303British},
-	{Loot_MAGAZINE,		1,		5Rnd_17HMR},
-	
-	//Shotgun
-	{Loot_MAGAZINE,		1,		8Rnd_12Gauge_Buck},
-	{Loot_MAGAZINE,		3,		8Rnd_12Gauge_Slug},
-	{Loot_MAGAZINE,		3,		2Rnd_12Gauge_Buck},
-	{Loot_MAGAZINE,		5,		2Rnd_12Gauge_Slug}
-};
-militaryVehicleAmmo[] = { //DZE
-	{Loot_MAGAZINE,		2,		2000Rnd_762x51_M134},
-	{Loot_MAGAZINE,		2,		29Rnd_30mm_AGS30},
-	{Loot_MAGAZINE,		2,		50Rnd_127x107_DSHKM},
-	{Loot_MAGAZINE,		2,		48Rnd_40mm_MK19},
-	{Loot_MAGAZINE,		3,		100Rnd_127x99_M2}
-};
-AmmoMilitaryLow[] =
-{
-	//Pistols
-	{Loot_MAGAZINE,		5,		7Rnd_45ACP_1911},
-	{Loot_MAGAZINE,		5,		8Rnd_9x18_Makarov},
-	{Loot_MAGAZINE,		2.5,	8Rnd_9x18_MakarovSD},
-	{Loot_MAGAZINE,		4,		15Rnd_9x19_M9},
-	{Loot_MAGAZINE,		2,		15Rnd_9x19_M9SD},
-	{Loot_MAGAZINE,		3,		17Rnd_9x19_glock17},
-	{Loot_MAGAZINE,		1.5,	17Rnd_9x19_glock17SD},
-	
-	//Submachineguns
-	{Loot_MAGAZINE,		4,		30Rnd_9x19_UZI},
-//	{Loot_MAGAZINE,		1,		30Rnd_9x19_UZI_SD},
-	{Loot_MAGAZINE,		8,		30Rnd_9x19_MP5},
-	{Loot_MAGAZINE,		4,		30Rnd_9x19_MP5SD},
-	{Loot_MAGAZINE,		6,		64Rnd_9x19_Bizon},
-	{Loot_MAGAZINE,		3,		64Rnd_9x19_SD_Bizon},
-	
-	//Assault rifles
-	{Loot_MAGAZINE,		10,		30Rnd_545x39_AK},
-	{Loot_MAGAZINE,		5,		30Rnd_545x39_AKSD},
-	{Loot_MAGAZINE,		4,		30Rnd_762x39_AK47},
-	{Loot_MAGAZINE,		4,		30Rnd_762x39_SA58},
-	{Loot_MAGAZINE,		8,		30Rnd_556x45_Stanag},
-	{Loot_MAGAZINE,		4,		30Rnd_556x45_StanagSD},
-	{Loot_MAGAZINE,		4,		30Rnd_556x45_G36},
-	{Loot_MAGAZINE,		3,		100Rnd_556x45_BetaCMag},
-	{Loot_MAGAZINE,		2,		30Rnd_556x45_G36SD},
-	
-	//Machine guns
-	{Loot_MAGAZINE,		4,		75Rnd_545x39_RPK},
-	{Loot_MAGAZINE,		1,		50Rnd_762x54_UK59},
-	{Loot_MAGAZINE,		1,		200Rnd_556x45_M249},
-	{Loot_MAGAZINE,		2,		100Rnd_556x45_M249},
-	{Loot_MAGAZINE,		2,		100Rnd_762x51_M240},
-	{Loot_MAGAZINE,		2,		100Rnd_762x54_PK},
-	{Loot_MAGAZINE,		3,		75Rnd_545x39_RPK},
-	{Loot_MAGAZINE,		3,		75Rnd_762x39_RPK},
-	{Loot_MAGAZINE,		3,		50Rnd_762x54_UK59},
-
-	//Sniper rifles
-	{Loot_MAGAZINE,		3,		5Rnd_762x51_M24},
-	{Loot_MAGAZINE,		3,		10Rnd_762x54_SVD},
-
-	//Grenade launchers
-	{Loot_MAGAZINE,		4,		1Rnd_HE_M203},
-	{Loot_MAGAZINE,		6,		1Rnd_HE_GP25},
-	{Loot_MAGAZINE,		3,		FlareWhite_M203},
-	{Loot_MAGAZINE,		5,		FlareWhite_GP25},
-	{Loot_MAGAZINE,		3,		FlareGreen_M203},
-	{Loot_MAGAZINE,		5,		FlareGreen_GP25},
-	{Loot_MAGAZINE,		3,		1Rnd_Smoke_M203},
-	{Loot_MAGAZINE,		5,		1Rnd_Smoke_GP25},
-
-	//DZE
-	{Loot_MAGAZINE,		3,		5Rnd_127x108_KSVK},
-	{Loot_MAGAZINE,		2,		10Rnd_127x99_m107},
-	{Loot_MAGAZINE,		4,		5Rnd_17HMR},
-	{Loot_MAGAZINE,		3,		20Rnd_762x51_SB_SCAR},
-	{Loot_MAGAZINE,		3,		20Rnd_9x39_SP5_VSS},
-	{Loot_MAGAZINE,		3,		5Rnd_86x70_L115A1},
-	{Loot_MAGAZINE,		3,		20Rnd_B_765x17_Ball},
-	{Loot_MAGAZINE,		4,		20Rnd_762x51_DMR},
-	{Loot_MAGAZINE,		4,		20Rnd_762x51_FNFAL},
-	{Loot_MAGAZINE,		3,		20Rnd_762x51_B_SCAR},
-	{Loot_MAGAZINE,		4,		20Rnd_B_AA12_Pellets},
-	{Loot_MAGAZINE,		4,		20Rnd_B_AA12_74Slug},
-//	{Loot_MAGAZINE,		3,		20Rnd_B_AA12_HE},
-	
-	//Handgrenades
-	{Loot_MAGAZINE,		5,		SmokeShell},
-	{Loot_MAGAZINE,		5,		SmokeShellRed},
-	{Loot_MAGAZINE,		5,		SmokeShellGreen}
-};
-
-AmmoMilitaryHigh[] =
-{
-	//Assault rifles
-	{Loot_MAGAZINE,		10,		30Rnd_762x39_AK47},
-	{Loot_MAGAZINE,		10,		30Rnd_762x39_SA58},
-	{Loot_MAGAZINE,		10,		30Rnd_556x45_Stanag},
-	{Loot_MAGAZINE,		5,		30Rnd_556x45_G36},
-	{Loot_MAGAZINE,		5,		100Rnd_556x45_BetaCMag},
-	{Loot_MAGAZINE,		5,		20Rnd_762x51_B_SCAR},
-	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_Pellets},
-	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_74Slug},
-//	{Loot_MAGAZINE,		5,		20Rnd_B_AA12_HE},
-	
-	//Battle rifles
-	{Loot_MAGAZINE,		5,		20Rnd_762x51_DMR},
-	{Loot_MAGAZINE,		6,		20Rnd_762x51_FNFAL},
-	
-	//Machine guns
-	{Loot_MAGAZINE,		1,		200Rnd_556x45_M249},
-	{Loot_MAGAZINE,		3,		100Rnd_556x45_M249},
-	{Loot_MAGAZINE,		2,		100Rnd_762x51_M240},
-	{Loot_MAGAZINE,		3,		100Rnd_762x54_PK},
-	{Loot_MAGAZINE,		7,		75Rnd_545x39_RPK},
-	{Loot_MAGAZINE,		5,		75Rnd_762x39_RPK},
-	{Loot_MAGAZINE,		4,		50Rnd_762x54_UK59},
-	
-	//Sniper rifles
-	{Loot_MAGAZINE,		8,		5Rnd_762x51_M24},
-	{Loot_MAGAZINE,		6,		10Rnd_762x54_SVD},
-
-	//DZE
-	{Loot_MAGAZINE,		6,		5Rnd_86x70_L115A1},
-	{Loot_MAGAZINE,		7,		20Rnd_B_765x17_Ball},
-
-	//Handgrenades
-	{Loot_MAGAZINE,		2,		HandGrenade_East},
-	{Loot_MAGAZINE,		1,		HandGrenade_West}
-};
-
-//TODO: Chernarussian ammo groups (building loot)
-/*AmmoCZLow[] =
-{
-};
-
-AmmoCZHigh[] =
-{
-};*/
-
-AmmoRU[] =
-{
-	//Pistols
-	{Loot_MAGAZINE,		8,		8Rnd_9x18_Makarov},
-	{Loot_MAGAZINE,		8,		8Rnd_9x18_MakarovSD},
-	
-	//Submachineguns
-	{Loot_MAGAZINE,		6,		30Rnd_9x19_UZI},
-	{Loot_MAGAZINE,		6,		64Rnd_9x19_Bizon},
-	{Loot_MAGAZINE,		6,		64Rnd_9x19_SD_Bizon},
-	
-	//Assault rifles
-	{Loot_MAGAZINE,		10,		30Rnd_545x39_AK},
-	{Loot_MAGAZINE,		8,		30Rnd_545x39_AKSD},
-	{Loot_MAGAZINE,		10,		30Rnd_762x39_AK47},
-	
-	//Machine guns
-	{Loot_MAGAZINE,		7,		75Rnd_545x39_RPK},
-	{Loot_MAGAZINE,		5,		75Rnd_762x39_RPK},
-	{Loot_MAGAZINE,		3,		100Rnd_762x54_PK},
-	
-	//Sniper rifles
-	{Loot_MAGAZINE,		7,		5Rnd_762x51_M24},
-	{Loot_MAGAZINE,		5,		10Rnd_762x54_SVD},
-	
-	//Grenade launchers
-	{Loot_MAGAZINE,		5,		1Rnd_HE_GP25},
-	{Loot_MAGAZINE,		3,		FlareWhite_GP25},
-	{Loot_MAGAZINE,		3,		FlareGreen_GP25},
-	{Loot_MAGAZINE,		4,		1Rnd_Smoke_GP25},
-	
-	//Handgrenades
-	{Loot_MAGAZINE,		2,		SmokeShell},
-	{Loot_MAGAZINE,		2,		SmokeShellRed},
-	{Loot_MAGAZINE,		2,		SmokeShellGreen},
-	{Loot_MAGAZINE,		2,		HandGrenade_East}
-};
-
-AmmoUS[] =
-{
-	//Pistols
-	{Loot_MAGAZINE,		8,		15Rnd_9x19_M9},
-	{Loot_MAGAZINE,		8,		15Rnd_9x19_M9SD},
-	
-	//Submachineguns
-	{Loot_MAGAZINE,		6,		30Rnd_9x19_MP5},
-	{Loot_MAGAZINE,		6,		30Rnd_9x19_MP5SD},
-	
-	//Assault rifles
-	{Loot_MAGAZINE,		10,		30Rnd_556x45_Stanag},
-	{Loot_MAGAZINE,		8,		30Rnd_556x45_StanagSD},
-	
-	//Battle rifles
-	{Loot_MAGAZINE,		4,		20Rnd_762x51_DMR},
-	
-	//Machine guns
-	{Loot_MAGAZINE,		2,		100Rnd_556x45_M249},
-	{Loot_MAGAZINE,		1,		200Rnd_556x45_M249},
-	{Loot_MAGAZINE,		2,		100Rnd_762x51_M240},
-	
-	//Sniper rifles
-	{Loot_MAGAZINE,		7,		5Rnd_762x51_M24},
-	
-	//Grenade launchers
-	{Loot_MAGAZINE,		5,		1Rnd_HE_M203},
-	{Loot_MAGAZINE,		3,		FlareWhite_M203},
-	{Loot_MAGAZINE,		3,		FlareGreen_M203},
-	{Loot_MAGAZINE,		4,		1Rnd_Smoke_M203},
-	
-	//Handgrenades
-	{Loot_MAGAZINE,		2,		SmokeShell},
-	{Loot_MAGAZINE,		2,		SmokeShellRed},
-	{Loot_MAGAZINE,		2,		SmokeShellGreen},
-	{Loot_MAGAZINE,		2,		HandGrenade_West}
-};
-
-AmmoEU[] =
-{
-	//Pistols
-	{Loot_MAGAZINE,		8,		17Rnd_9x19_glock17},
-	{Loot_MAGAZINE,		8,		17Rnd_9x19_glock17SD},
-	
-	//Submachineguns
-	{Loot_MAGAZINE,		6,		30Rnd_9x19_MP5},
-	{Loot_MAGAZINE,		6,		30Rnd_9x19_MP5SD},
-	
-	//Assault rifles
-	{Loot_MAGAZINE,		8,		30Rnd_556x45_G36},
-	{Loot_MAGAZINE,		8,		30Rnd_556x45_G36SD},
-	{Loot_MAGAZINE,		4,		30Rnd_556x45_Stanag},
-	
-	//Battle rifles
-	{Loot_MAGAZINE,		4,		20Rnd_762x51_FNFAL},
-	{Loot_MAGAZINE,		5,		20Rnd_762x51_B_SCAR},
-	
-	//Machine guns
-	{Loot_MAGAZINE,		2,		100Rnd_556x45_M249},
-	{Loot_MAGAZINE,		1,		200Rnd_556x45_M249},
-	{Loot_MAGAZINE,		2,		100Rnd_762x51_M240},
-	
-	//Sniper rifles
-	{Loot_MAGAZINE,		7,		5Rnd_762x51_M24},
-	
-	//Grenade launchers
-	{Loot_MAGAZINE,		5,		1Rnd_HE_M203},
-	{Loot_MAGAZINE,		3,		FlareWhite_M203},
-	{Loot_MAGAZINE,		3,		FlareGreen_M203},
-	{Loot_MAGAZINE,		4,		1Rnd_Smoke_M203},
-	
-	//Handgrenades
-	{Loot_MAGAZINE,		2,		SmokeShell},
-	{Loot_MAGAZINE,		2,		SmokeShellRed},
-	{Loot_MAGAZINE,		2,		SmokeShellGreen},
-	{Loot_MAGAZINE,		2,		HandGrenade_West}
-};
-
-AmmoUN[] =
-{
-	//Pistols
-	{Loot_MAGAZINE,		5,		7Rnd_45ACP_1911},
-	{Loot_MAGAZINE,		5,		8Rnd_9x18_Makarov},
-	{Loot_MAGAZINE,		3,		8Rnd_9x18_MakarovSD},
-	{Loot_MAGAZINE,		5,		15Rnd_9x19_M9},
-	{Loot_MAGAZINE,		3,		15Rnd_9x19_M9SD},
-	{Loot_MAGAZINE,		5,		17Rnd_9x19_glock17},
-	{Loot_MAGAZINE,		3,		17Rnd_9x19_glock17SD},
-	
-	//Submachineguns
-	{Loot_MAGAZINE,		6,		30Rnd_9x19_UZI},
-	{Loot_MAGAZINE,		6,		30Rnd_9x19_MP5},
-	{Loot_MAGAZINE,		6,		64Rnd_9x19_Bizon},
-	
-	//Assault rifles
-	{Loot_MAGAZINE,		10,		30Rnd_545x39_AK},
-	{Loot_MAGAZINE,		5,		30Rnd_545x39_AKSD},
-	{Loot_MAGAZINE,		6,		30Rnd_762x39_AK47},
-	{Loot_MAGAZINE,		4,		30Rnd_762x39_SA58},
-	{Loot_MAGAZINE,		6,		30Rnd_556x45_Stanag},
-	{Loot_MAGAZINE,		4,		30Rnd_556x45_G36},
-	
-	//Machine guns
-	{Loot_MAGAZINE,		5,		75Rnd_545x39_RPK},
-	
-	//Grenade launchers
-	{Loot_MAGAZINE,		4,		1Rnd_HE_M203},
-	{Loot_MAGAZINE,		4,		1Rnd_HE_GP25},
-	{Loot_MAGAZINE,		2,		FlareWhite_M203},
-	{Loot_MAGAZINE,		2,		FlareWhite_GP25},
-	{Loot_MAGAZINE,		2,		FlareGreen_M203},
-	{Loot_MAGAZINE,		2,		FlareGreen_GP25},
-	{Loot_MAGAZINE,		3,		1Rnd_Smoke_M203},
-	{Loot_MAGAZINE,		3,		1Rnd_Smoke_GP25},
-	
-	//Handgrenades
-	{Loot_MAGAZINE,		3,		SmokeShell},
-	{Loot_MAGAZINE,		3,		SmokeShellRed},
-	{Loot_MAGAZINE,		3,		SmokeShellGreen}
-};
-
-//DZE
-sniperriflesammo[] = {
-	{Loot_MAGAZINE,		3,		5Rnd_127x108_KSVK},
-	{Loot_MAGAZINE,		3,		5Rnd_86x70_L115A1},
-	{Loot_MAGAZINE,		2,		10Rnd_127x99_m107},
-	{Loot_MAGAZINE,		3,		10Rnd_762x54_SVD},
-	{Loot_MAGAZINE,		4,		20Rnd_762x51_DMR},
-	{Loot_MAGAZINE,		4,		5Rnd_762x51_M24},
-	{Loot_MAGAZINE,		4,		5Rnd_17HMR},
-	{Loot_MAGAZINE,		3,		20Rnd_762x51_SB_SCAR},
-	{Loot_MAGAZINE,		3,		20Rnd_9x39_SP5_VSS}
-};
-assaultrifleammo[] = {
-	{Loot_MAGAZINE,		5,		30Rnd_545x39_AKSD},
-	{Loot_MAGAZINE,		5,		30Rnd_762x39_SA58},
-	{Loot_MAGAZINE,		5,		30Rnd_762x39_AK47},
-	{Loot_MAGAZINE,		8,		30Rnd_556x45_Stanag},
-	{Loot_MAGAZINE,		10,		30Rnd_545x39_AK},
-	{Loot_MAGAZINE,		5,		30Rnd_556x45_StanagSD},
-	{Loot_MAGAZINE,		8,		20Rnd_762x51_FNFAL},
-	{Loot_MAGAZINE,		6,		20Rnd_762x51_B_SCAR}
-};
-machinegunammo[] = {
-	{Loot_MAGAZINE,		4,		100Rnd_556x45_BetaCMag},
-	{Loot_MAGAZINE,		3,		75Rnd_545x39_RPK},
-	{Loot_MAGAZINE,		4,		100Rnd_556x45_M249},
-	{Loot_MAGAZINE,		3,		100Rnd_762x51_M240},
-	{Loot_MAGAZINE,		3,		100Rnd_762x54_PK},
-	{Loot_MAGAZINE,		4,		200Rnd_556x45_M249}
-};
-machinegunammoexpl[] = {
-	{Loot_MAGAZINE,		4,		100Rnd_556x45_BetaCMag},
-	{Loot_MAGAZINE,		3,		75Rnd_545x39_RPK},
-	{Loot_MAGAZINE,		4,		100Rnd_556x45_M249},
-	{Loot_MAGAZINE,		3,		100Rnd_762x51_M240},
-	{Loot_MAGAZINE,		3,		100Rnd_762x54_PK},
-	{Loot_MAGAZINE,		4,		200Rnd_556x45_M249},
-	{Loot_MAGAZINE,		1,		MAAWS_HEAT},
-	{Loot_MAGAZINE,		2,		PipeBomb}
-};
+// Ammo is organized in matching groups US,RU,CZ,EU, and Residential.
+// 45Rnd_545x39_RPK removed due to 1.64 patch
+
+AmmoCivilian[] =
+{
+	// Pistols
+	{Loot_MAGAZINE,		7,		8Rnd_9x18_Makarov},
+	{Loot_MAGAZINE,		5,		7Rnd_45ACP_1911},
+	{Loot_MAGAZINE,		3,		6Rnd_45ACP},
+	
+	// Rifles
+	{Loot_MAGAZINE,		3,		15Rnd_W1866_Slug},
+	{Loot_MAGAZINE,		2,		5Rnd_762x54_Mosin},
+	{Loot_MAGAZINE,		2,		10Rnd_303British},
+	{Loot_MAGAZINE,		1,		5Rnd_17HMR},
+	
+	//  Shotgun
+	{Loot_MAGAZINE,		1,		8Rnd_12Gauge_Buck},
+	{Loot_MAGAZINE,		1,		8Rnd_12Gauge_Slug},
+	{Loot_MAGAZINE,		1,		2Rnd_12Gauge_Buck},
+	{Loot_MAGAZINE,		1,		2Rnd_12Gauge_Slug}
+};
+
+militaryVehicleAmmo[] = { //DZE
+	{Loot_MAGAZINE,		1,		2000Rnd_762x51_M134},
+	{Loot_MAGAZINE,		1,		29Rnd_30mm_AGS30},
+	{Loot_MAGAZINE,		1,		50Rnd_127x107_DSHKM},
+	{Loot_MAGAZINE,		1,		48Rnd_40mm_MK19},
+	{Loot_MAGAZINE,		1,		100Rnd_127x99_M2}
+};
+
+// This ammo spawns on zombies near military buildings
+AmmoMilitaryZed[] = {
+	{Loot_GROUP,		1,		AmmoCZ},
+	{Loot_GROUP,		1,		AmmoRU},
+	{Loot_GROUP,		1,		AmmoUS},
+	{Loot_GROUP,		1,		AmmoEU}
+};
+
+AmmoCZ[] = {
+	
+	// Sniper rifles
+	{Loot_MAGAZINE,		1,		10Rnd_762x51_CZ750},
+	{Loot_MAGAZINE,		3,		20Rnd_762x51_B_SCAR},
+	
+	// Submachine guns
+	{Loot_MAGAZINE,		3,		20Rnd_9x19_EVO},
+	{Loot_MAGAZINE,		3,		20Rnd_9x19_EVOSD},
+	{Loot_MAGAZINE,		3,		20Rnd_B_765x17_Ball},
+	
+	// Pistols
+	{Loot_MAGAZINE,		5,		18Rnd_9x19_Phantom},
+	{Loot_MAGAZINE,		5,		18Rnd_9x19_PhantomSD},
+	
+	// Assault rifles
+	{Loot_MAGAZINE,		3,		30Rnd_556x45_G36},
+	{Loot_MAGAZINE,		3,		30Rnd_556x45_G36SD},
+	{Loot_MAGAZINE,		3,		30Rnd_762x39_SA58},
+	
+	// Machine gun
+	{Loot_MAGAZINE,		1,		50Rnd_762x54_UK59}
+};
+
+AmmoRU[] =
+{
+	// Pistols
+	{Loot_MAGAZINE,		8,		8Rnd_9x18_Makarov},
+	{Loot_MAGAZINE,		8,		8Rnd_9x18_MakarovSD},
+	
+	// Submachine guns
+	{Loot_MAGAZINE,		6,		64Rnd_9x19_Bizon},
+	{Loot_MAGAZINE,		6,		64Rnd_9x19_SD_Bizon},
+	{Loot_MAGAZINE,		3,		20Rnd_9x39_SP5_VSS},
+	
+	// Assault rifles
+	{Loot_MAGAZINE,		10,		30Rnd_545x39_AK},
+	{Loot_MAGAZINE,		8,		30Rnd_545x39_AKSD},
+	{Loot_MAGAZINE,		10,		30Rnd_762x39_AK47},
+	
+	// Sniper rifles
+	{Loot_MAGAZINE,		5,		10Rnd_762x54_SVD},
+	{Loot_MAGAZINE,		3,		5Rnd_127x108_KSVK},
+	{Loot_MAGAZINE,		1,		3rnd_Anzio_20x102mm},
+	
+	// Machine guns
+	{Loot_MAGAZINE,		3,		75Rnd_545x39_RPK},
+	{Loot_MAGAZINE,		3,		75Rnd_762x39_RPK},
+	{Loot_MAGAZINE,		3,		100Rnd_762x54_PK},
+	
+	// Grenade launchers
+	{Loot_MAGAZINE,		2,		1Rnd_HE_GP25},
+	{Loot_MAGAZINE,		2,		FlareWhite_GP25},
+	{Loot_MAGAZINE,		2,		FlareGreen_GP25},
+	{Loot_MAGAZINE,		2,		1Rnd_Smoke_GP25},
+	
+	// Hand grenades
+	{Loot_MAGAZINE,		1,		SmokeShell},
+	{Loot_MAGAZINE,		1,		SmokeShellRed},
+	{Loot_MAGAZINE,		1,		SmokeShellGreen},
+	{Loot_MAGAZINE,		1,		HandGrenade_East}
+};
+
+AmmoUS[] =
+{
+	// Pistols
+	{Loot_MAGAZINE,		8,		15Rnd_9x19_M9},
+	{Loot_MAGAZINE,		8,		15Rnd_9x19_M9SD},
+	
+	// Submachine guns
+	{Loot_MAGAZINE,		6,		30Rnd_9x19_UZI},
+	{Loot_MAGAZINE,		6,		30Rnd_9x19_UZI_SD},
+	
+	// Assault rifles
+	{Loot_MAGAZINE,		10,		30Rnd_556x45_Stanag},
+	{Loot_MAGAZINE,		8,		30Rnd_556x45_StanagSD},
+	
+	// Sniper rifles
+	{Loot_MAGAZINE,		7,		5Rnd_762x51_M24},
+	{Loot_MAGAZINE,		1,		10Rnd_127x99_m107},
+	{Loot_MAGAZINE,		4,		20Rnd_762x51_DMR},
+	
+	// Machine guns
+	{Loot_MAGAZINE,		3,		100Rnd_556x45_M249},
+	{Loot_MAGAZINE,		3,		100Rnd_762x51_M240},
+	{Loot_MAGAZINE,		3,		200Rnd_556x45_M249},
+	
+	// Grenade launchers
+	{Loot_MAGAZINE,		1,		1Rnd_HE_M203},
+	{Loot_MAGAZINE,		1,		FlareWhite_M203},
+	{Loot_MAGAZINE,		1,		FlareGreen_M203},
+	{Loot_MAGAZINE,		1,		1Rnd_Smoke_M203},
+	
+	// Hand grenades
+	{Loot_MAGAZINE,		1,		SmokeShell},
+	{Loot_MAGAZINE,		1,		SmokeShellRed},
+	{Loot_MAGAZINE,		1,		SmokeShellGreen},
+	{Loot_MAGAZINE,		1,		HandGrenade_West}
+};
+
+AmmoEU[] =
+{
+	// Pistols
+	{Loot_MAGAZINE,		8,		17Rnd_9x19_glock17},
+	{Loot_MAGAZINE,		8,		17Rnd_9x19_glock17SD},
+	
+	// Submachine guns
+	{Loot_MAGAZINE,		6,		30Rnd_9x19_MP5},
+	{Loot_MAGAZINE,		6,		30Rnd_9x19_MP5SD},
+	
+	// Assault rifles
+	{Loot_MAGAZINE,		10,		30Rnd_556x45_G36},
+	{Loot_MAGAZINE,		8,		30Rnd_556x45_G36SD},
+	{Loot_MAGAZINE,		6,		30Rnd_556x45_Stanag},
+	{Loot_MAGAZINE,		3,		30Rnd_556x45_StanagSD},
+	
+	// Battle rifles
+	{Loot_MAGAZINE,		4,		20Rnd_762x51_FNFAL},
+	{Loot_MAGAZINE,		5,		20Rnd_762x51_B_SCAR},
+	{Loot_MAGAZINE,		3,		20Rnd_762x51_SB_SCAR},
+	
+	//Sniper rifle
+	{Loot_MAGAZINE,		3,		5Rnd_86x70_L115A1},
+	{Loot_MAGAZINE,		1,		5Rnd_127x99_as50},
+	
+	// Machine guns
+	{Loot_MAGAZINE,		3,		100Rnd_556x45_BetaCMag},
+	{Loot_MAGAZINE,		3,		100Rnd_556x45_M249},
+	{Loot_MAGAZINE,		3,		100Rnd_762x51_M240},
+	{Loot_MAGAZINE,		3,		200Rnd_556x45_M249},
+	
+	//Grenade launchers
+	{Loot_MAGAZINE,		1,		1Rnd_HE_M203},
+	{Loot_MAGAZINE,		1,		FlareWhite_M203},
+	{Loot_MAGAZINE,		1,		FlareGreen_M203},
+	{Loot_MAGAZINE,		1,		1Rnd_Smoke_M203},
+	
+	// Hand grenades
+	{Loot_MAGAZINE,		1,		SmokeShell},
+	{Loot_MAGAZINE,		1,		SmokeShellRed},
+	{Loot_MAGAZINE,		1,		SmokeShellGreen},
+	{Loot_MAGAZINE,		1,		HandGrenade_West}
+};
+
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp
index c3f35e38f..3656e6797 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/AmmoBox.hpp
@@ -1,106 +1,121 @@
-//5.45x39mm
-AmmoBoxRU1[] =
-{
-	{Loot_MAGAZINE,		6,		30Rnd_545x39_AK},
-	{Loot_MAGAZINE,		3,		30Rnd_545x39_AKSD},
-	{Loot_MAGAZINE,		1,		75Rnd_545x39_RPK}
-};
-
-//7.62x39mm
-AmmoBoxRU2[] =
-{
-	{Loot_MAGAZINE,		9,		30Rnd_762x39_AK47},
-	{Loot_MAGAZINE,		1,		75Rnd_762x39_RPK}
-};
-
-//7.62x54Rmm
-AmmoBoxRU3[] =
-{
-	{Loot_MAGAZINE,		9,		10Rnd_762x54_SVD},
-	{Loot_MAGAZINE,		1,		100Rnd_762x54_PK}
-};
-
-//5.56x45mm
-AmmoBoxUS1[] =
-{
-	{Loot_MAGAZINE,		14,		30Rnd_556x45_Stanag},
-	{Loot_MAGAZINE,		8,		30Rnd_556x45_StanagSD},
-	{Loot_MAGAZINE,		1.5,	100Rnd_556x45_M249},
-	{Loot_MAGAZINE,		0.5,	200Rnd_556x45_M249}
-};
-
-//7.62x51mm
-AmmoBoxUS2[] =
-{
-	{Loot_MAGAZINE,		9,		20Rnd_762x51_DMR},
-	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240}
-};
-
-//5.56x45mm
-AmmoBoxEU1[] =
-{
-	{Loot_MAGAZINE,		14,		30Rnd_556x45_G36},
-	{Loot_MAGAZINE,		8,		30Rnd_556x45_G36SD},
-	{Loot_MAGAZINE,		1.5,	100Rnd_556x45_M249},
-	{Loot_MAGAZINE,		0.5,	200Rnd_556x45_M249}
-};
-
-//7.62x51mm
-AmmoBoxEU2[] =
-{
-	{Loot_MAGAZINE,		9,		20Rnd_762x51_FNFAL},
-	{Loot_MAGAZINE, 	5, 		20Rnd_762x51_B_SCAR},
-	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240},
-	{Loot_MAGAZINE,		4,		5Rnd_86x70_L115A1}
-};
-
-//7.62x39mm
-AmmoBoxCZ1[] =
-{
-	{Loot_MAGAZINE,		9,		30Rnd_762x39_SA58},
-	{Loot_MAGAZINE,		1,		75Rnd_762x39_RPK}
-};
-
-//7.62x54Rmm
-AmmoBoxCZ2[] =
-{
-	{Loot_MAGAZINE,		1,		50Rnd_762x54_UK59}
-};
-
-//GP-25
-AmmoBoxRU4[] =
-{
-	{Loot_MAGAZINE,		3,		1Rnd_HE_GP25},
-	{Loot_MAGAZINE,		0.5,	FlareWhite_GP25},
-	{Loot_MAGAZINE,		0.5,	FlareGreen_GP25},
-	{Loot_MAGAZINE,		1,		1Rnd_Smoke_GP25}
-};
-
-//M203
-AmmoBoxUS3[] =
-{
-	{Loot_MAGAZINE,		3,		1Rnd_HE_M203},
-	{Loot_MAGAZINE,		0.5,	FlareWhite_M203},
-	{Loot_MAGAZINE,		0.5,	FlareGreen_M203},
-	{Loot_MAGAZINE,		1,		1Rnd_Smoke_M203}
-};
-
-//Explosives
-AmmoBoxRU5[] =
-{
-	{Loot_MAGAZINE,		2,		HandGrenade_East},
-	{Loot_MAGAZINE,		1,		SmokeShell},
-	{Loot_MAGAZINE,		1,		SmokeShellRed},
-	{Loot_MAGAZINE,		1,		SmokeShellGreen},
-	{Loot_MAGAZINE,		0.1,	PipeBomb}
-};
-
-//Explosives
-AmmoBoxUS4[] =
-{
-	{Loot_MAGAZINE,		2,		HandGrenade_West},
-	{Loot_MAGAZINE,		1,		SmokeShell},
-	{Loot_MAGAZINE,		1,		SmokeShellRed},
-	{Loot_MAGAZINE,		1,		SmokeShellGreen},
-	{Loot_MAGAZINE,		0.3,	PipeBomb}
+//5.45x39mm
+AmmoBoxRU1[] =
+{
+	{Loot_MAGAZINE,		6,		30Rnd_545x39_AK},
+	{Loot_MAGAZINE,		3,		30Rnd_545x39_AKSD},
+	{Loot_MAGAZINE,		1,		75Rnd_545x39_RPK}
+};
+
+//7.62x39mm
+AmmoBoxRU2[] =
+{
+	{Loot_MAGAZINE,		5,		30Rnd_762x39_AK47},
+	{Loot_MAGAZINE,		1,		75Rnd_762x39_RPK}
+};
+
+//7.62x54Rmm
+AmmoBoxRU3[] =
+{
+	{Loot_MAGAZINE,		5,		10Rnd_762x54_SVD},
+	{Loot_MAGAZINE,		1,		100Rnd_762x54_PK}
+};
+
+//5.56x45mm
+AmmoBoxUS1[] =
+{
+	{Loot_MAGAZINE,		10,		30Rnd_556x45_Stanag},
+	{Loot_MAGAZINE,		8,		30Rnd_556x45_StanagSD},
+	{Loot_MAGAZINE,		2,		100Rnd_556x45_M249},
+	{Loot_MAGAZINE,		1,		200Rnd_556x45_M249}
+};
+
+//7.62x51mm
+AmmoBoxUS2[] =
+{
+	{Loot_MAGAZINE,		4,		20Rnd_762x51_DMR},
+	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240}
+};
+
+//5.56x45mm
+AmmoBoxEU1[] =
+{
+	{Loot_MAGAZINE,		10,		30Rnd_556x45_G36},
+	{Loot_MAGAZINE,		8,		30Rnd_556x45_G36SD},
+	{Loot_MAGAZINE,		2,		100Rnd_556x45_M249},
+	{Loot_MAGAZINE,		1,		200Rnd_556x45_M249}
+};
+
+//7.62x51mm and .338 Lapua
+AmmoBoxEU2[] =
+{
+	{Loot_MAGAZINE,		5,		20Rnd_762x51_FNFAL},
+	{Loot_MAGAZINE, 	3, 		20Rnd_762x51_B_SCAR},
+	{Loot_MAGAZINE,		1,		5Rnd_86x70_L115A1}
+};
+
+// L85 and 7.62x51 LMG
+AmmoBoxEU3[] =
+{
+	{Loot_MAGAZINE,		10,		30Rnd_556x45_Stanag},
+	{Loot_MAGAZINE,		6,		30Rnd_556x45_StanagSD},
+	{Loot_MAGAZINE,		1,		100Rnd_762x51_M240}
+};
+
+// Assault Rifles
+AmmoBoxCZ1[] =
+{
+	{Loot_MAGAZINE,		1,		30Rnd_762x39_SA58},
+	{Loot_MAGAZINE,		3,		30Rnd_556x45_G36},
+	{Loot_MAGAZINE,		1,		30Rnd_556x45_G36SD}
+};
+
+// Machine Guns
+AmmoBoxCZ2[] =
+{
+	{Loot_MAGAZINE,		1,		50Rnd_762x54_UK59},
+	{Loot_MAGAZINE,		4,		20Rnd_9x19_EVO},
+	{Loot_MAGAZINE,		2,		20Rnd_9x19_EVOSD}
+};
+
+//Sniper Rifle
+AmmoBoxCZ3[] =
+{
+	{Loot_MAGAZINE,		1,		10Rnd_762x51_CZ750},
+	{Loot_MAGAZINE,		3,		20Rnd_762x51_B_SCAR}
+};
+
+//GP-25
+AmmoBoxRU4[] =
+{
+	{Loot_MAGAZINE,		3,		1Rnd_HE_GP25},
+	{Loot_MAGAZINE,		1,		FlareWhite_GP25},
+	{Loot_MAGAZINE,		1,		FlareGreen_GP25},
+	{Loot_MAGAZINE,		1,		1Rnd_Smoke_GP25}
+};
+
+//M203
+AmmoBoxUS3[] =
+{
+	{Loot_MAGAZINE,		3,		1Rnd_HE_M203},
+	{Loot_MAGAZINE,		1,		FlareWhite_M203},
+	{Loot_MAGAZINE,		1,		FlareGreen_M203},
+	{Loot_MAGAZINE,		1,		1Rnd_Smoke_M203}
+};
+
+//Explosives
+AmmoBoxRU5[] =
+{
+	{Loot_MAGAZINE,		2,		HandGrenade_East},
+	{Loot_MAGAZINE,		1,		SmokeShell},
+	{Loot_MAGAZINE,		1,		SmokeShellRed},
+	{Loot_MAGAZINE,		1,		SmokeShellGreen}
+};
+
+//Explosives
+AmmoBoxUS4[] =
+{
+	{Loot_MAGAZINE,		2,		HandGrenade_West},
+	{Loot_MAGAZINE,		1,		SmokeShell},
+	{Loot_MAGAZINE,		1,		SmokeShellRed},
+	{Loot_MAGAZINE,		1,		SmokeShellGreen}
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp
index b2180ca64..70d70270f 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Attachments.hpp
@@ -1,32 +1,54 @@
-AttachmentsGeneric[] =
-{
-	{Loot_MAGAZINE,		3,		Attachment_BELT},
-	{Loot_MAGAZINE,		1,		Attachment_SCOPED},
-	{Loot_MAGAZINE,		2,		Attachment_FL},
-	{Loot_MAGAZINE,		2,		Attachment_FL_Pist}
-};
-
-AttachmentsEast[] =
-{
-	{Loot_MAGAZINE,		2,		Attachment_Kobra},
-	{Loot_MAGAZINE,		1,		Attachment_PSO1},
-	{Loot_MAGAZINE,		3,		Attachment_Sup9},
-	{Loot_MAGAZINE,		1,		Attachment_Sup545},
-	{Loot_MAGAZINE,		2,		Attachment_GP25},
-	{Loot_MAGAZINE,		2,		Attachment_Ghillie},
-	{Loot_MAGAZINE,		3,		Attachment_SA58RIS}
-};
-
-AttachmentsWest[] =
-{
-	{Loot_MAGAZINE,		1.5,	Attachment_CCO},
-	{Loot_MAGAZINE,		1,		Attachment_Holo},
-	{Loot_MAGAZINE,		0.5,	Attachment_ACOG},
-	{Loot_MAGAZINE,		3,		Attachment_Ghillie},
-	{Loot_MAGAZINE,		2,		Attachment_M203},
-	{Loot_MAGAZINE,		1,		Attachment_Sup556},
-	{Loot_MAGAZINE,		3,		Attachment_Sup9},
-	{Loot_MAGAZINE,		3,		Attachment_SA58RIS},
-	{Loot_MAGAZINE,		3,		Attachment_MFL},
-	{Loot_MAGAZINE,		3,		Attachment_MFL_Pist}
-};
+// Attachments for Mosin, Rem870, M9, G17, and Makarov
+AttachmentsGeneric[] =
+{
+	{Loot_MAGAZINE,		1,		Attachment_BELT}, // Mosin
+	{Loot_MAGAZINE,		1,		Attachment_SCOPED}, // Mosin
+	{Loot_MAGAZINE,		1,		Attachment_FL}, // Mosin
+	{Loot_MAGAZINE,		1,		Attachment_MFL}, // Mosin
+	{Loot_MAGAZINE,		1,		Attachment_Sup9}
+};
+
+// Attachments for Russian Guns
+AttachmentsRU[] =
+{
+	{Loot_MAGAZINE,		1,		Attachment_Kobra},
+	{Loot_MAGAZINE,		1,		Attachment_PSO1},
+	{Loot_MAGAZINE,		1,		Attachment_Sup9},
+	{Loot_MAGAZINE,		1,		Attachment_Sup545},
+	{Loot_MAGAZINE,		1,		Attachment_GP25},
+	{Loot_MAGAZINE,		1,		Attachment_Ghillie}
+};
+
+// Attachments for U.S. Guns
+AttachmentsUS[] =
+{
+	{Loot_MAGAZINE,		1,		Attachment_CCO},
+	{Loot_MAGAZINE,		1,		Attachment_Holo},
+	{Loot_MAGAZINE,		1,		Attachment_ACOG},
+	{Loot_MAGAZINE,		1,		Attachment_Ghillie},
+	{Loot_MAGAZINE,		1,		Attachment_M203},
+	{Loot_MAGAZINE,		1,		Attachment_Sup556},
+	{Loot_MAGAZINE,		1,		Attachment_Sup9}
+};
+
+// Attachments for European Guns
+AttachmentsEU[] =
+{
+	{Loot_MAGAZINE,		1,		Attachment_CCO},
+	{Loot_MAGAZINE,		1,		Attachment_Holo},
+	{Loot_MAGAZINE,		1,		Attachment_ACOG},
+	{Loot_MAGAZINE,		1,		Attachment_Sup556},
+	{Loot_MAGAZINE,		3,		Attachment_Sup9},
+	{Loot_MAGAZINE,		1,		Attachment_MFL},
+	{Loot_MAGAZINE,		3,		Attachment_MFL_Pist} // G17 only
+};
+
+// Attachments for SA58
+AttachmentsCZ[] =
+{
+	{Loot_MAGAZINE,		1,		Attachment_CCO},
+	{Loot_MAGAZINE,		1,		Attachment_Holo},
+	{Loot_MAGAZINE,		1,		Attachment_ACOG},
+	{Loot_MAGAZINE,		1,		Attachment_SA58RIS},
+	{Loot_MAGAZINE,		1,		Attachment_MFL}
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Backpacks.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Backpacks.hpp
index 6d72151d7..a7783b0a6 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Backpacks.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Backpacks.hpp
@@ -1,17 +1,16 @@
 backpacks[] = {
-	{Loot_BACKPACK,		4,		DZ_BP_Assault},
-	{Loot_BACKPACK,		2,		DZ_BP_VestPouch},
-	{Loot_BACKPACK,		2,		DZ_BP_Patrol},
+	{Loot_BACKPACK,		5,		DZ_Assault_Pack_EP1},
+	{Loot_BACKPACK,		5,		DZ_Czech_Vest_Pouch},
+	{Loot_BACKPACK,		4,		DZ_Patrol_Pack_EP1},
 	{Loot_BACKPACK,		4,		DZ_TerminalPack_EP1},
-	{Loot_BACKPACK,		3,		DZ_BP_Alice},
-	{Loot_BACKPACK,		3,		DZ_BP_Survival},
-	{Loot_BACKPACK,		3,		DZ_CompactPack_EP1}
+	{Loot_BACKPACK,		3,		DZ_ALICE_Pack_EP1},
+	{Loot_BACKPACK,		2,		DZ_TK_Assault_Pack_EP1},
+	{Loot_BACKPACK,		1,		DZ_CompactPack_EP1}
 };
 militarybackpacks[] = {
-	//{Loot_GROUP,		10,		backpacks},
-	{Loot_BACKPACK,		3,		DZ_BP_British},
+	{Loot_BACKPACK,		3,		DZ_British_ACU},
 	{Loot_BACKPACK,		2,		DZ_GunBag_EP1},
-	{Loot_BACKPACK,		2,		DZ_BP_Czech},
-	{Loot_BACKPACK,		2,		DZ_BP_Coyote},
+	{Loot_BACKPACK,		2,		DZ_CivilBackpack_EP1},
+	{Loot_BACKPACK,		2,		DZ_Backpack_EP1},
 	{Loot_BACKPACK,		1,		DZ_LargeGunBag_EP1}
-};
\ No newline at end of file
+};
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/CarePackage.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/CarePackage.hpp
index 4d9a39126..081927426 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/CarePackage.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/CarePackage.hpp
@@ -1,19 +1,16 @@
 //Vehicle class, min loot, max loot, min loot distance, max loot distance
 CarePackageType[] =
 {
-	{Loot_NONE,			5,		Misc_cargo_cont_net1, 3, 6},
-	{Loot_NONE,			4,		Misc_cargo_cont_net2, 4, 9},
-	{Loot_NONE,			3,		Misc_cargo_cont_net3, 5, 12}
+	{Loot_NONE,			5,		Misc_cargo_cont_net1, 4, 8},
+	{Loot_NONE,			4,		Misc_cargo_cont_net2, 6, 10},
+	{Loot_NONE,			3,		Misc_cargo_cont_net3, 8, 12}
 };
 
 CarePackage[] =
 {
 	//Tools
-	{Loot_WEAPON,		5,		ItemFlashlight},
-	{Loot_WEAPON,		2,		ItemCompass},
-	{Loot_WEAPON,		3,		ItemMap},
-	{Loot_WEAPON,		4,		ItemWatch},
-	{Loot_WEAPON,		5,		ItemKnife},
+	{Loot_GROUP,		6,		ToolsMilitary},
+	{Loot_GROUP,		6,		ToolsBuilding},
 	
 	//Backpacks
 	{Loot_GROUP,		4,		backpacks},
@@ -24,10 +21,15 @@ CarePackage[] =
 	{Loot_CONTAINER,	3,		DZ_MedBox, MedicalHigh, 8, 16},
 	
 	//Items
-	{Loot_MAGAZINE,		6,		ItemTent},
-	{Loot_MAGAZINE,		4,		ItemDomeTent},
+	{Loot_GROUP,		10,		tents},
 	{Loot_PILE,			10,		MedicalLow, 1, 3},
-	{Loot_PILE,			15,		Consumable, 1, 3},
-	{Loot_WEAPON,		3,		ItemMatchbox},
-	{Loot_GROUP,		12,		Generic}
+	{Loot_PILE,			15,		Consumable, 1, 3}
+	//DZE from old SupplyDrop group
+	//{Loot_MAGAZINE,		1,		bulk_ItemTankTrap},
+	//{Loot_MAGAZINE,		1,		PartPlywoodPack},
+	//{Loot_MAGAZINE,		1,		PartPlankPack},
+	//{Loot_MAGAZINE,		1,		bulk_PartGeneric},
+	//{Loot_MAGAZINE,		1,		bulk_ItemSandbag},
+	//{Loot_MAGAZINE,		1,		MortarBucket},
+	//{Loot_MAGAZINE,		3,		CinderBlocks}
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Clothes.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Clothes.hpp
index 84eb6cc9f..9677f3aac 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Clothes.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Clothes.hpp
@@ -1,89 +1,89 @@
 clothes[] = {
-	{Loot_MAGAZINE,	3,	Skin_RU_Policeman_DZ},
-	{Loot_MAGAZINE,	3,	Skin_Pilot_EP1_DZ},
-	{Loot_MAGAZINE,	3,	Skin_Functionary1_EP1_DZ},
-	{Loot_MAGAZINE,	3,	Skin_Priest_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Rocker1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Rocker2_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Rocker3_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Rocker4_DZ},
-	{Loot_MAGAZINE,	2,	Skin_SurvivorW3_DZ},
-	{Loot_MAGAZINE,	2,	Skin_SurvivorWpink_DZ},
-	{Loot_MAGAZINE,	2,	Skin_SurvivorWurban_DZ},
+	{Loot_MAGAZINE,	1,	Skin_RU_Policeman_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Pilot_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Functionary1_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Priest_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Rocker1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Rocker2_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Rocker3_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Rocker4_DZ},
+	{Loot_MAGAZINE,	1,	Skin_SurvivorW3_DZ},
+	{Loot_MAGAZINE,	1,	Skin_SurvivorWpink_DZ},
+	{Loot_MAGAZINE,	1,	Skin_SurvivorWurban_DZ},
 	{Loot_MAGAZINE,	1,	Skin_INS_Bardak_DZ},
 	{Loot_MAGAZINE,	1,	Skin_INS_Worker2_DZ},
-	{Loot_MAGAZINE,	2,	Skin_INS_Lopotev_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Doctor_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Assistant_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Worker1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Worker3_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Worker4_DZ},
-	{Loot_MAGAZINE,	2,	Skin_TK_CIV_Takistani01_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_TK_CIV_Takistani03_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_TK_CIV_Takistani04_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_TK_CIV_Takistani06_EP1_DZ}
+	{Loot_MAGAZINE,	1,	Skin_INS_Lopotev_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Doctor_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Assistant_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Worker1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Worker3_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Worker4_DZ},
+	{Loot_MAGAZINE,	1,	Skin_TK_CIV_Takistani01_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_TK_CIV_Takistani03_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_TK_CIV_Takistani04_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_TK_CIV_Takistani06_EP1_DZ}
 };
+
+// These should probably be split up into separate groups.
 militaryclothes[] = {
-	{Loot_MAGAZINE,	3,	Skin_Camo1_DZ},
-	{Loot_MAGAZINE,	3,	Skin_Sniper1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Rocket_DZ},
-	{Loot_MAGAZINE,	3,	Skin_Soldier1_DZ},
-	{Loot_MAGAZINE,	3,	Skin_Drake_Light_DZ},
-	{Loot_MAGAZINE,	3,	Skin_Soldier_TL_PMC_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Soldier_Sniper_PMC_DZ},
-	{Loot_MAGAZINE,	3,	Skin_Soldier_Bodyguard_AA12_PMC_DZ},
-	{Loot_MAGAZINE,	2,	Skin_CZ_Special_Forces_GL_DES_EP1_DZ},
-	{Loot_MAGAZINE,	3,	Skin_FR_OHara_DZ},
-	{Loot_MAGAZINE,	3,	Skin_FR_Rodriguez_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Camo1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Sniper1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Rocket_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Soldier1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Drake_Light_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Soldier_TL_PMC_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Soldier_Sniper_PMC_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Soldier_Bodyguard_AA12_PMC_DZ},
+	{Loot_MAGAZINE,	1,	Skin_CZ_Special_Forces_GL_DES_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_FR_OHara_DZ},
+	{Loot_MAGAZINE,	1,	Skin_FR_Rodriguez_DZ},
 	{Loot_MAGAZINE,	1,	Skin_CZ_Soldier_Sniper_EP1_DZ},
-	{Loot_MAGAZINE,	3,	Skin_Graves_Light_DZ},
-	{Loot_MAGAZINE,	2,	Skin_INS_Soldier_AR_DZ},
-	{Loot_MAGAZINE,	2,	Skin_INS_Soldier_CO_DZ},
-	{Loot_MAGAZINE,	2,	Skin_USMC_Soldier_Officer_DZ},
-	{Loot_MAGAZINE,	2,	Skin_USMC_Soldier_MG_DZ},
-	{Loot_MAGAZINE,	2,	Skin_USMC_Soldier_Pilot_DZ},
-	{Loot_MAGAZINE,	2,	Skin_FR_TL_DZ},
-	{Loot_MAGAZINE,	2,	Skin_FR_R_DZ},
-	{Loot_MAGAZINE,	2,	Skin_FR_Sapper_DZ},
-	{Loot_MAGAZINE,	2,	Skin_FR_Marksman_DZ},
-	{Loot_MAGAZINE,	2,	Skin_FR_Assault_R_DZ},
-	{Loot_MAGAZINE,	2,	Skin_US_Soldier_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_UN_CDF_Soldier_Guard_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_UN_CDF_Soldier_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_GER_Soldier_TL_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_BAF_Soldier_Officer_MTP_DZ},
-	{Loot_MAGAZINE,	2,	Skin_BAF_Soldier_N_MTP_DZ}
-};
-specialclothes[] = {
-	{Loot_MAGAZINE,	3,	Skin_Ins_Soldier_GL_DZ},
-	{Loot_MAGAZINE,	3,	Skin_GUE_Commander_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Graves_Light_DZ},
+	{Loot_MAGAZINE,	1,	Skin_INS_Soldier_AR_DZ},
+	{Loot_MAGAZINE,	1,	Skin_INS_Soldier_CO_DZ},
+	{Loot_MAGAZINE,	1,	Skin_USMC_Soldier_Officer_DZ},
+	{Loot_MAGAZINE,	1,	Skin_USMC_Soldier_MG_DZ},
+	{Loot_MAGAZINE,	1,	Skin_USMC_Soldier_Pilot_DZ},
+	{Loot_MAGAZINE,	1,	Skin_FR_TL_DZ},
+	{Loot_MAGAZINE,	1,	Skin_FR_R_DZ},
+	{Loot_MAGAZINE,	1,	Skin_FR_Sapper_DZ},
+	{Loot_MAGAZINE,	1,	Skin_FR_Marksman_DZ},
+	{Loot_MAGAZINE,	1,	Skin_FR_Assault_R_DZ},
+	{Loot_MAGAZINE,	1,	Skin_US_Soldier_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_UN_CDF_Soldier_Guard_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_UN_CDF_Soldier_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_GER_Soldier_TL_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_BAF_Soldier_Officer_MTP_DZ},
+	{Loot_MAGAZINE,	1,	Skin_BAF_Soldier_N_MTP_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Ins_Soldier_GL_DZ},
+	{Loot_MAGAZINE,	1,	Skin_GUE_Commander_DZ},
 	{Loot_MAGAZINE,	4,	Skin_Bandit1_DZ},
-	{Loot_MAGAZINE,	3,	Skin_Bandit2_DZ},
-	{Loot_MAGAZINE,	2,	Skin_BanditW1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_BanditW2_DZ},
-	{Loot_MAGAZINE,	2,	Skin_TK_INS_Soldier_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_TK_INS_Warlord_EP1_DZ},
-	{Loot_MAGAZINE,	3,	Skin_SurvivorWcombat_DZ},
-	{Loot_MAGAZINE,	3,	Skin_SurvivorWdesert_DZ},
-	{Loot_MAGAZINE,	2,	Skin_GUE_Soldier_MG_DZ},
-	{Loot_MAGAZINE,	2,	Skin_GUE_Soldier_Sniper_DZ},
-	{Loot_MAGAZINE,	2,	Skin_GUE_Soldier_Crew_DZ},
-	{Loot_MAGAZINE,	2,	Skin_GUE_Soldier_CO_DZ},
-	{Loot_MAGAZINE,	2,	Skin_GUE_Soldier_2_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Bandit2_DZ},
+	{Loot_MAGAZINE,	1,	Skin_BanditW1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_BanditW2_DZ},
+	{Loot_MAGAZINE,	1,	Skin_TK_INS_Soldier_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_TK_INS_Warlord_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_SurvivorWcombat_DZ},
+	{Loot_MAGAZINE,	1,	Skin_SurvivorWdesert_DZ},
+	{Loot_MAGAZINE,	1,	Skin_GUE_Soldier_MG_DZ},
+	{Loot_MAGAZINE,	1,	Skin_GUE_Soldier_Sniper_DZ},
+	{Loot_MAGAZINE,	1,	Skin_GUE_Soldier_Crew_DZ},
+	{Loot_MAGAZINE,	1,	Skin_GUE_Soldier_CO_DZ},
+	{Loot_MAGAZINE,	1,	Skin_GUE_Soldier_2_DZ},
 	{Loot_MAGAZINE,	1,	Skin_TK_Special_Forces_MG_EP1_DZ},
 	{Loot_MAGAZINE,	1,	Skin_TK_Soldier_Sniper_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_TK_Commander_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_RU_Soldier_Crew_DZ},
-	{Loot_MAGAZINE,	2,	Skin_TK_INS_Soldier_AR_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_TK_GUE_Soldier_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_CZ_Soldier_SL_DES_EP1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_RU_Soldier_DZ},
-	{Loot_MAGAZINE,	2,	Skin_RU_Soldier_Officer_DZ},
-	{Loot_MAGAZINE,	2,	Skin_RUS_Soldier1_DZ},
-	{Loot_MAGAZINE,	2,	Skin_RUS_Commander_DZ},
-	{Loot_MAGAZINE,	2,	Skin_MVD_Soldier_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Ins_Soldier_2_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Ins_Commander_DZ},
-	{Loot_MAGAZINE,	2,	Skin_Ins_Soldier_Crew_DZ},
-	{Loot_MAGAZINE,	2,	Skin_CDF_Soldier_DZ}
+	{Loot_MAGAZINE,	1,	Skin_TK_Commander_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_RU_Soldier_Crew_DZ},
+	{Loot_MAGAZINE,	1,	Skin_TK_INS_Soldier_AR_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_TK_GUE_Soldier_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_CZ_Soldier_SL_DES_EP1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_RU_Soldier_DZ},
+	{Loot_MAGAZINE,	1,	Skin_RU_Soldier_Officer_DZ},
+	{Loot_MAGAZINE,	1,	Skin_RUS_Soldier1_DZ},
+	{Loot_MAGAZINE,	1,	Skin_RUS_Commander_DZ},
+	{Loot_MAGAZINE,	1,	Skin_MVD_Soldier_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Ins_Soldier_2_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Ins_Commander_DZ},
+	{Loot_MAGAZINE,	1,	Skin_Ins_Soldier_Crew_DZ},
+	{Loot_MAGAZINE,	1,	Skin_CDF_Soldier_DZ}
 };
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Consumable.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Consumable.hpp
index 4a364f420..c2d91fa6a 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Consumable.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Consumable.hpp
@@ -1,70 +1,64 @@
 Consumable[] =
 {
-	{Loot_MAGAZINE,		3,		ItemWaterBottleUnfilled}, //TODO: replace with canteen to better fit Epoch lootPosSmall
-	{Loot_MAGAZINE,		3,		ItemWaterBottleSafe},
-	{Loot_MAGAZINE,		3,		ItemWaterBottle},
-	{Loot_MAGAZINE,		3,		ItemHeatPack},
-	
-	{Loot_MAGAZINE,		3,		ItemSodaCoke},
-	{Loot_MAGAZINE,		3,		ItemSodaPepsi},
+	{Loot_MAGAZINE,		1,		ItemWaterBottleUnfilled}, //TODO: replace with canteen to better fit Epoch lootPosSmall
+	{Loot_MAGAZINE,		1,		ItemWaterBottleSafe},
+	{Loot_MAGAZINE,		1,		ItemWaterBottle},
+	{Loot_MAGAZINE,		1,		ItemHeatPack},
+	{Loot_MAGAZINE,		1,		ItemSodaCoke},
+	{Loot_MAGAZINE,		1,		ItemSodaPepsi},
 	{Loot_MAGAZINE,		1,		ItemSodaMdew},
 	{Loot_MAGAZINE,		1,		ItemSodaRbull},
 	{Loot_MAGAZINE,		1,		ItemSodaOrangeSherbet},
-
-	{Loot_MAGAZINE,		2,		ItemSodaMtngreen},
-	{Loot_MAGAZINE,		5,		ItemSodaR4z0r},
-	{Loot_MAGAZINE,		5,		ItemSodaClays},
-	{Loot_MAGAZINE,		5,		ItemSodaSmasht},
-	{Loot_MAGAZINE,		5,		ItemSodaDrwaste},
-	{Loot_MAGAZINE,		5,		ItemSodaFranka},
-	{Loot_MAGAZINE,		5,		ItemSodaLemonade},
-	{Loot_MAGAZINE,		5,		ItemSodaLirik},
-	{Loot_MAGAZINE,		2,		ItemSodaLvg},
-	{Loot_MAGAZINE,		5,		ItemSodaMzly},
-	{Loot_MAGAZINE,		5,		ItemSodaPeppsy},
-	{Loot_MAGAZINE,		2,		ItemSodaRabbit},
-	{Loot_MAGAZINE,		5,		ItemSodaSacrite},
+	{Loot_MAGAZINE,		1,		ItemSodaMtngreen},
+	{Loot_MAGAZINE,		1,		ItemSodaR4z0r},
+	{Loot_MAGAZINE,		1,		ItemSodaClays},
+	{Loot_MAGAZINE,		1,		ItemSodaSmasht},
+	{Loot_MAGAZINE,		1,		ItemSodaDrwaste},
+	{Loot_MAGAZINE,		1,		ItemSodaFranka},
+	{Loot_MAGAZINE,		1,		ItemSodaLemonade},
+	{Loot_MAGAZINE,		1,		ItemSodaLirik},
+	{Loot_MAGAZINE,		1,		ItemSodaLvg},
+	{Loot_MAGAZINE,		1,		ItemSodaMzly},
+	{Loot_MAGAZINE,		1,		ItemSodaPeppsy},
+	{Loot_MAGAZINE,		1,		ItemSodaRabbit},
+	{Loot_MAGAZINE,		1,		ItemSodaSacrite},
 	{Loot_MAGAZINE,		1,		ItemSodaRocketFuel},
 	{Loot_MAGAZINE,		1,		ItemSodaGrapeDrink},
 	{Loot_MAGAZINE,		1,		ItemSherbet},
-	
-	{Loot_MAGAZINE,		3,		FoodPistachio},
-	{Loot_MAGAZINE,		4,		FoodNutmix},
-	{Loot_MAGAZINE,		4,		FoodChipsSulahoops},
-	{Loot_MAGAZINE,		4,		FoodChipsMysticales},
-	{Loot_MAGAZINE,		4,		FoodChipsChocolate},
-	{Loot_MAGAZINE,		4,		FoodCandyChubby},
-	{Loot_MAGAZINE,		4,		FoodCandyAnders},
-	{Loot_MAGAZINE,		4,		FoodCandyLegacys},
-	{Loot_MAGAZINE,		4,		FoodCandyMintception},
-	{Loot_MAGAZINE,		4,		FoodCakeCremeCakeClean},
-	
-	{Loot_MAGAZINE,		5,		FoodCanBeef},
-	{Loot_MAGAZINE,		5,		FoodCanPotatoes},
-	{Loot_MAGAZINE,		5,		FoodCanGriff},
-	{Loot_MAGAZINE,		5,		FoodCanBadguy},
-	{Loot_MAGAZINE,		5,		FoodCanBoneboy},
-	{Loot_MAGAZINE,		5,		FoodCanCorn},
-	{Loot_MAGAZINE,		5,		FoodCanCurgon},
-	{Loot_MAGAZINE,		5,		FoodCanDemon},
-	{Loot_MAGAZINE,		5,		FoodCanFraggleos},
-	{Loot_MAGAZINE,		5,		FoodCanHerpy},
-	{Loot_MAGAZINE,		5,		FoodCanDerpy},
-	{Loot_MAGAZINE,		5,		FoodCanOrlok},
-	{Loot_MAGAZINE,		5,		FoodCanPowell},
-	{Loot_MAGAZINE,		5,		FoodCanTylers},
-	
-	{Loot_MAGAZINE,		4,		FoodCanUnlabeled},
-	{Loot_MAGAZINE,		2,		FoodCanBakedBeans},
-	{Loot_MAGAZINE,		2,		FoodCanSardines},
-	{Loot_MAGAZINE,		2,		FoodCanFrankBeans},
-	{Loot_MAGAZINE,		2,		FoodCanPasta},
-	{Loot_MAGAZINE,		2,		FoodBioMeat},
-	
-	{Loot_MAGAZINE,		5,		FoodCanRusUnlabeled},
-	{Loot_MAGAZINE,		5,		FoodCanRusStew},
-	{Loot_MAGAZINE,		5,		FoodCanRusPork},
-	{Loot_MAGAZINE,		5,		FoodCanRusPeas},
-	{Loot_MAGAZINE,		4,		FoodCanRusMilk},
-	{Loot_MAGAZINE,		5,		FoodCanRusCorn}
+	{Loot_MAGAZINE,		1,		FoodPistachio},
+	{Loot_MAGAZINE,		1,		FoodNutmix},
+	{Loot_MAGAZINE,		1,		FoodChipsSulahoops},
+	{Loot_MAGAZINE,		1,		FoodChipsMysticales},
+	{Loot_MAGAZINE,		1,		FoodChipsChocolate},
+	{Loot_MAGAZINE,		1,		FoodCandyChubby},
+	{Loot_MAGAZINE,		1,		FoodCandyAnders},
+	{Loot_MAGAZINE,		1,		FoodCandyLegacys},
+	{Loot_MAGAZINE,		1,		FoodCandyMintception},
+	{Loot_MAGAZINE,		1,		FoodCakeCremeCakeClean},
+	{Loot_MAGAZINE,		1,		FoodCanBeef},
+	{Loot_MAGAZINE,		1,		FoodCanPotatoes},
+	{Loot_MAGAZINE,		1,		FoodCanGriff},
+	{Loot_MAGAZINE,		1,		FoodCanBadguy},
+	{Loot_MAGAZINE,		1,		FoodCanBoneboy},
+	{Loot_MAGAZINE,		1,		FoodCanCorn},
+	{Loot_MAGAZINE,		1,		FoodCanCurgon},
+	{Loot_MAGAZINE,		1,		FoodCanDemon},
+	{Loot_MAGAZINE,		1,		FoodCanFraggleos},
+	{Loot_MAGAZINE,		1,		FoodCanHerpy},
+	{Loot_MAGAZINE,		1,		FoodCanDerpy},
+	{Loot_MAGAZINE,		1,		FoodCanOrlok},
+	{Loot_MAGAZINE,		1,		FoodCanPowell},
+	{Loot_MAGAZINE,		1,		FoodCanTylers},
+	{Loot_MAGAZINE,		1,		FoodCanUnlabeled},
+	{Loot_MAGAZINE,		1,		FoodCanBakedBeans},
+	{Loot_MAGAZINE,		1,		FoodCanSardines},
+	{Loot_MAGAZINE,		1,		FoodCanFrankBeans},
+	{Loot_MAGAZINE,		1,		FoodCanPasta},
+	{Loot_MAGAZINE,		1,		FoodBioMeat},
+	{Loot_MAGAZINE,		1,		FoodCanRusUnlabeled},
+	{Loot_MAGAZINE,		1,		FoodCanRusStew},
+	{Loot_MAGAZINE,		1,		FoodCanRusPork},
+	{Loot_MAGAZINE,		1,		FoodCanRusPeas},
+	{Loot_MAGAZINE,		1,		FoodCanRusMilk},
+	{Loot_MAGAZINE,		1,		FoodCanRusCorn}
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp
index 9cfa58be1..57d21f43e 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/CrashSite.hpp
@@ -1,243 +1,171 @@
-//Crash site types
-//Vehicle class, loot group
-CrashSiteType[] =
-{
-	{Loot_NONE,			2,		CrashSite_RU, CrashSiteRU},		//Russian Mi-8
-	{Loot_NONE,			1,		CrashSite_US, CrashSiteUS},		//American UH-1Y
-	{Loot_NONE,			1,		CrashSite_EU, CrashSiteEU},		//European HC3
-	{Loot_NONE,			1,		CrashSite_UN, CrashSiteUN}		//United Nations Mi-8
-};
-
-
-
-/* Russian */
-
-CrashSiteRU[] =
-{
-	{Loot_GROUP,		10,		assaultrifles},
-	{Loot_GROUP,		4,		submachinegun},
-	{Loot_GROUP,		7,		sniperrifles},
-	{Loot_GROUP,		6,		machineguns},
-	{Loot_GROUP,		3,		Military},
-	{Loot_WEAPON,		0.2,	MAAWS},
-	//Tools
-	{Loot_WEAPON,		1.5,	ItemGPS},
-	{Loot_WEAPON,		1,		Binocular_Vector},
-	{Loot_WEAPON,		0.5,	NVGoggles},
-	
-	//Backpacks
-	{Loot_GROUP,		4,		militarybackpacks},
-	{Loot_GROUP,		4,		militaryVehicleAmmo},
-
-	//Clothing
-	{Loot_GROUP,		3,		militaryclothes},
-	{Loot_GROUP,		2,		specialclothes},
-	
-	//Containers
-	{Loot_CONTAINER,	1,		DZ_MedBox, MedicalBox, 10, 20},
-	//{Loot_CONTAINER,	2.3,	DZ_AmmoBoxRU, AmmoBoxRU1, 10, 20},		//545x39	AK74, RPK74
-	//{Loot_CONTAINER,	1.7,	DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},		//762x39	AK47
-	//{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10},		//762x54r	SVD, PKM
-	
-	//Other
-	{Loot_MAGAZINE,		1,		PartVRotor},
-	{Loot_MAGAZINE,		2,		forest_large_net_kit},
-	{Loot_GROUP,		7,		AttachmentsEast},
-	{Loot_GROUP,		3,		AttachmentsWest},
-	
-	//Piles
-	{Loot_PILE,			15,		CrashSiteRUPile, 2, 4}
-};
-
-CrashSiteRUPile[] =
-{
-	//Tools
-	{Loot_WEAPON,		2,		ItemCompass},
-	{Loot_WEAPON,		3,		Binocular},
-	{Loot_WEAPON,		4,		ItemKnife},
-	{Loot_WEAPON,		4,		ItemMap},
-	
-	//Items
-	{Loot_MAGAZINE,		8,		FoodMRE},
-	
-	//Other
-	{Loot_GROUP,		10,		Consumable},
-	{Loot_GROUP,		30,		AmmoRU},
-	{Loot_GROUP,		20,		MedicalLow}
-};
-
-
-
-/* American */
-
-CrashSiteUS[] =
-{
-	//Weapons
-	{Loot_GROUP,		10,		assaultrifles},
-	{Loot_GROUP,		4,		submachinegun},
-	{Loot_GROUP,		7,		sniperrifles},
-	{Loot_GROUP,		6,		machineguns},
-	{Loot_GROUP,		3,		Military},
-	{Loot_WEAPON,		0.2,	MAAWS},
-
-	//Tools
-	{Loot_WEAPON,		1.5,	ItemGPS},
-	{Loot_WEAPON,		1,		Binocular_Vector},
-	{Loot_WEAPON,		0.5,	NVGoggles},
-	
-	//Backpacks
-	{Loot_GROUP,		4,		militarybackpacks},
-	{Loot_GROUP,		4,		militaryVehicleAmmo},
-
-	//Clothing
-	{Loot_GROUP,		3,		militaryclothes},
-	{Loot_GROUP,		2,		specialclothes},
-
-	//Containers
-	//{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
-	//{Loot_CONTAINER,	3,		DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20},		//556x45	STANAG, M249
-	//{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxUS2, 5, 10},		//762x51	DMR, M240
-	
-	//Other
-	{Loot_MAGAZINE,		1,		PartVRotor},
-	{Loot_MAGAZINE,		2,		forest_large_net_kit},
-	{Loot_GROUP,		10,		AttachmentsWest},
-	
-	//Piles
-	{Loot_PILE,			15,		CrashSiteUSPile, 2, 4}
-};
-
-CrashSiteUSPile[] =
-{
-	//Tools
-	{Loot_WEAPON,		2,		ItemCompass},
-	{Loot_WEAPON,		3,		Binocular},
-	{Loot_WEAPON,		4,		ItemKnife},
-	{Loot_WEAPON,		4,		ItemMap},
-	
-	//Items
-	{Loot_MAGAZINE,		8,		FoodMRE},
-	
-	//Other
-	{Loot_GROUP,		10,		Consumable},
-	{Loot_GROUP,		30,		AmmoUS},
-	{Loot_GROUP,		20,		MedicalLow}
-};
-
-
-
-/* European */
-
-CrashSiteEU[] =
-{
-	//Weapons
-	{Loot_GROUP,		10,		assaultrifles},
-	{Loot_GROUP,		4,		submachinegun},
-	{Loot_GROUP,		7,		sniperrifles},
-	{Loot_GROUP,		6,		machineguns},
-	{Loot_GROUP,		3,		Military},
-	{Loot_WEAPON,		0.2,	MAAWS},
-
-	//Tools
-	{Loot_WEAPON,		1.5,	ItemGPS},
-	{Loot_WEAPON,		1,		Binocular_Vector},
-	{Loot_WEAPON,		0.5,	NVGoggles},
-	
-	//Backpacks
-	{Loot_GROUP,		4,		militarybackpacks},
-	{Loot_GROUP,		4,		militaryVehicleAmmo},
-
-	//Clothing
-	{Loot_GROUP,		3,		militaryclothes},
-	{Loot_GROUP,		2,		specialclothes},
-	
-	//Containers
-	{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
-	//{Loot_CONTAINER,	3,		DZ_AmmoBoxUS, AmmoBoxEU1, 10, 20},		//556x45	G36, M249
-	//{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxEU2, 5, 10},		//762x51	FAL, M240
-	
-	//Other
-	{Loot_MAGAZINE,		1,		PartVRotor},
-	{Loot_MAGAZINE,		2,		desert_net_kit},
-	{Loot_GROUP,		10,		AttachmentsWest},
-	
-	//Piles
-	{Loot_PILE,			15,		CrashSiteEUPile, 2, 4}
-};
-
-CrashSiteEUPile[] =
-{
-	//Tools
-	{Loot_WEAPON,		2,		ItemCompass},
-	{Loot_WEAPON,		3,		Binocular},
-	{Loot_WEAPON,		4,		ItemKnife},
-	{Loot_WEAPON,		4,		ItemMap},
-	
-	//Items
-	{Loot_MAGAZINE,		8,		FoodMRE},
-	
-	//Other
-	{Loot_GROUP,		10,		Consumable},
-	{Loot_GROUP,		30,		AmmoEU},
-	{Loot_GROUP,		20,		MedicalLow}
-};
-
-
-
-/* United Nations */
-
-CrashSiteUN[] =
-{
-	//Weapons
-	{Loot_GROUP,		10,		assaultrifles},
-	{Loot_GROUP,		4,		submachinegun},
-	{Loot_GROUP,		7,		sniperrifles},
-	{Loot_GROUP,		6,		machineguns},
-	{Loot_GROUP,		3,		Military},
-	{Loot_WEAPON,		0.2,	MAAWS},
-
-	//Tools
-	{Loot_WEAPON,		1.5,	ItemGPS},
-	{Loot_WEAPON,		1,		Binocular_Vector},
-	{Loot_WEAPON,		0.5,	NVGoggles},
-	
-	//Backpacks
-	{Loot_GROUP,		4,		militarybackpacks},
-	{Loot_GROUP,		4,		militaryVehicleAmmo},
-	
-	//Clothing
-	{Loot_GROUP,		3,		militaryclothes},
-	{Loot_GROUP,		2,		specialclothes},
-	
-	//Containers
-	{Loot_CONTAINER,	10,		DZ_MedBox, MedicalBox, 10, 20},
-	{Loot_CONTAINER,	10,		DZ_CardboardBox, Consumable, 10, 20},
-	//{Loot_CONTAINER,	2,		DZ_AmmoBoxUS, AmmoBoxUS1, 5, 15},		//556x45	STANAG, M249
-	//{Loot_CONTAINER,	2,		DZ_AmmoBoxRU, AmmoBoxRU1, 5, 15},		//545x39	AK74, RPK74
-	
-	//Other
-	{Loot_MAGAZINE,		1,		PartVRotor},
-	{Loot_MAGAZINE,		2,		desert_large_net_kit},
-	{Loot_GROUP,		3,		AttachmentsEast},
-	{Loot_GROUP,		3,		AttachmentsWest},
-	
-	//Piles
-	{Loot_PILE,			20,		CrashSiteUNPile, 2, 4}
-};
-
-CrashSiteUNPile[] =
-{
-	//Tools
-	{Loot_WEAPON,		4,		ItemCompass},
-	{Loot_WEAPON,		6,		Binocular},
-	{Loot_WEAPON,		4,		ItemKnife},
-	{Loot_WEAPON,		6,		ItemMap},
-	
-	//Items
-	{Loot_MAGAZINE,		4,		FoodMRE},
-	
-	//Other
-	{Loot_GROUP,		20,		Consumable},
-	{Loot_GROUP,		20,		AmmoUN},
-	{Loot_GROUP,		30,		MedicalHigh}
+//Crash site types
+//Vehicle class, loot group
+CrashSiteType[] =
+{
+	{Loot_NONE,			2,		CrashSite_RU, CrashSiteRU},		//Russian Mi-8
+	{Loot_NONE,			1,		CrashSite_US, CrashSiteUS},		//American UH-1Y
+	{Loot_NONE,			1,		CrashSite_EU, CrashSiteEU},		//European HC3
+	{Loot_NONE,			1,		CrashSite_UN, CrashSiteCZ}		//United Nations Mi-8
+};
+
+CrashSiteRU[] =
+{
+	// Weapons
+	{Loot_GROUP,		30,		weaponsRU},
+	{Loot_WEAPON,		1,		Anzio_20_DZ}, // High value weapon
+	
+	//Tools
+	{Loot_GROUP,		3,		ToolsMilitary},
+	
+	//Backpacks
+	{Loot_GROUP,		4,		militarybackpacks},
+	{Loot_GROUP,		4,		militaryVehicleAmmo},
+
+	//Clothing
+	{Loot_GROUP,		3,		militaryclothes},
+	
+	//Containers
+	{Loot_CONTAINER,	1,		DZ_MedBox, MedicalBox, 10, 20},
+	{Loot_CONTAINER,	3,		DZ_CardboardBox, Consumable, 10, 20},
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxRU1, 10, 20},
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxRU2, 10, 20},
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxRU3, 5, 10},
+	
+	//Other
+	{Loot_MAGAZINE,		1,		PartVRotor},
+	{Loot_MAGAZINE,		2,		forest_large_net_kit},
+	{Loot_GROUP,		10,		AttachmentsRU},
+	
+	//Piles
+	{Loot_PILE,			15,		CrashSiteRUPile, 2, 4}
+};
+
+CrashSiteRUPile[] =
+{
+	{Loot_GROUP,		5,		ToolsMilitary},
+	{Loot_MAGAZINE,		10,		FoodMRE},
+	{Loot_GROUP,		15,		AmmoRU},
+	{Loot_MAGAZINE,		3,		3rnd_Anzio_20x102mm},
+	{Loot_GROUP,		10,		MedicalLow}
+};
+
+CrashSiteUS[] =
+{
+	//Weapons
+	{Loot_GROUP,		30,		weaponsUS},
+	{Loot_WEAPON,		1,		M107_DZ}, // High value weapon
+
+	//Tools
+	{Loot_GROUP,		3,		ToolsMilitary},
+	
+	//Backpacks
+	{Loot_GROUP,		4,		militarybackpacks},
+	{Loot_GROUP,		4,		militaryVehicleAmmo},
+
+	//Clothing
+	{Loot_GROUP,		3,		militaryclothes},
+
+	//Containers
+	{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
+	{Loot_CONTAINER,	3,		DZ_CardboardBox, Consumable, 10, 20},
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxUS1, 10, 20},
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxUS2, 5, 10},
+	
+	//Other
+	{Loot_MAGAZINE,		1,		PartVRotor},
+	{Loot_MAGAZINE,		2,		forest_large_net_kit},
+	{Loot_GROUP,		10,		AttachmentsUS},
+	
+	//Piles
+	{Loot_PILE,			15,		CrashSiteUSPile, 2, 4}
+};
+
+CrashSiteUSPile[] =
+{
+	{Loot_GROUP,		5,		ToolsMilitary},
+	{Loot_MAGAZINE,		10,		FoodMRE},
+	{Loot_GROUP,		15,		AmmoUS},
+	{Loot_MAGAZINE,		3,		10Rnd_127x99_m107},
+	{Loot_GROUP,		10,		MedicalLow}
+};
+
+CrashSiteEU[] =
+{
+	//Weapons
+	{Loot_GROUP,		30,		weaponsEU},
+	{Loot_WEAPON,		1,		BAF_AS50_scoped_DZ}, // High value weapon
+
+	//Tools
+	{Loot_GROUP,		3,		ToolsMilitary},
+	
+	//Backpacks
+	{Loot_GROUP,		4,		militarybackpacks},
+	{Loot_GROUP,		4,		militaryVehicleAmmo},
+
+	//Clothing
+	{Loot_GROUP,		3,		militaryclothes},
+	
+	//Containers
+	{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
+	{Loot_CONTAINER,	3,		DZ_CardboardBox, Consumable, 10, 20},
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxEU1, 10, 20},
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxEU2, 5, 10},
+	
+	//Other
+	{Loot_MAGAZINE,		1,		PartVRotor},
+	{Loot_MAGAZINE,		2,		desert_net_kit},
+	{Loot_GROUP,		10,		AttachmentsEU},
+	
+	//Piles
+	{Loot_PILE,			15,		CrashSiteEUPile, 2, 4}
+};
+
+CrashSiteEUPile[] =
+{
+	{Loot_GROUP,		5,		ToolsMilitary},
+	{Loot_MAGAZINE,		10,		FoodMRE},
+	{Loot_GROUP,		15,		AmmoEU},
+	{Loot_MAGAZINE,		3,		5Rnd_127x99_as50},
+	{Loot_GROUP,		10,		MedicalLow}
+};
+
+CrashSiteCZ[] =
+{
+	//Weapons
+	{Loot_GROUP,		30,		weaponsCZ},
+	{Loot_WEAPON,		1,		MAAWS}, // High value weapon
+
+	//Tools
+	{Loot_GROUP,		3,		ToolsMilitary},
+	
+	//Backpacks
+	{Loot_GROUP,		4,		militarybackpacks},
+	{Loot_GROUP,		4,		militaryVehicleAmmo},
+	
+	//Clothing
+	{Loot_GROUP,		3,		militaryclothes},
+	
+	//Containers
+	{Loot_CONTAINER,	3,		DZ_MedBox, MedicalBox, 10, 20},
+	{Loot_CONTAINER,	3,		DZ_CardboardBox, Consumable, 10, 20},
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxCZ1, 10, 20},
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxRU, AmmoBoxCZ2, 10, 20},
+	{Loot_CONTAINER,	1,		DZ_AmmoBoxUS, AmmoBoxCZ3, 10, 20},
+	
+	//Other
+	{Loot_MAGAZINE,		1,		PartVRotor},
+	{Loot_MAGAZINE,		2,		desert_large_net_kit},
+	{Loot_GROUP,		10,		AttachmentsCZ},
+	
+	//Piles
+	{Loot_PILE,			15,		CrashSiteCZPile, 2, 4}
+};
+
+CrashSiteCZPile[] =
+{
+	{Loot_GROUP,		5,		ToolsMilitary},
+	{Loot_MAGAZINE,		10,		FoodMRE},
+	{Loot_GROUP,		15,		AmmoCZ},
+	{Loot_MAGAZINE,		3,		MAAWS_HEAT},
+	{Loot_GROUP,		10,		MedicalHigh}
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp
index 832cd074e..359325d3a 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Generic.hpp
@@ -1,58 +1,38 @@
-Generic[] =
-{
-	{Loot_MAGAZINE,		1,		1Rnd_Arrow_Wood},
-	
-	{Loot_MAGAZINE,		1,		HandRoadFlare},
-	{Loot_MAGAZINE,		1,		HandChemGreen},
-	{Loot_MAGAZINE,		1,		HandChemBlue},
-	{Loot_MAGAZINE,		1,		HandChemRed},
-
-	//DZE
-	{Loot_MAGAZINE,		1,		5Rnd_17HMR},
-	{Loot_MAGAZINE,		2,		10Rnd_303British},
-	{Loot_MAGAZINE,		2,		15Rnd_W1866_Slug},
-	{Loot_MAGAZINE,		2,		5Rnd_762x54_Mosin},
-	{Loot_MAGAZINE,		2,		8Rnd_9x18_Makarov},
-	{Loot_MAGAZINE,		2,		7Rnd_45ACP_1911},
-	{Loot_MAGAZINE,		2,		6Rnd_45ACP},
-	
-//	{Loot_MAGAZINE,		1,		ItemBookBible},
-	
-	{Loot_MAGAZINE,		1,		equip_string},
-	{Loot_MAGAZINE,		1,		ItemDocument},
-	{Loot_MAGAZINE,		1,		equip_duct_tape},
-	{Loot_MAGAZINE,		1,		equip_rope},
-	{Loot_MAGAZINE,		1,		equip_herb_box},
-//	{Loot_MAGAZINE,		1,		equip_pvc_box},
-	{Loot_MAGAZINE,		1,		equip_lever},
-	{Loot_MAGAZINE,		1,		equip_rag},
-	{Loot_MAGAZINE,		0.3,	equip_nails},
-	{Loot_MAGAZINE,		1,		PartWoodPile},
-	
-	{Loot_GROUP,		1,		FuelCan}
-};
-
-tents[] = {
-	{Loot_MAGAZINE,		0.5,	ItemDomeTent},
-	{Loot_MAGAZINE,		1,		ItemTent},
-	{Loot_MAGAZINE,		0.5,	ItemDesertTent} //EPOCH ADDITION
-};
-
-GenericSmall[] =
-{	
-	{Loot_MAGAZINE,		1,		HandRoadFlare},
-	{Loot_MAGAZINE,		1,		HandChemGreen},
-	{Loot_MAGAZINE,		1,		HandChemBlue},
-	{Loot_MAGAZINE,		1,		HandChemRed},
-	{Loot_MAGAZINE,		1,		5Rnd_17HMR},
-	{Loot_MAGAZINE,		2,		10Rnd_303British},
-	{Loot_MAGAZINE,		2,		15Rnd_W1866_Slug},
-	{Loot_MAGAZINE,		1,		5Rnd_762x54_Mosin},
-	{Loot_MAGAZINE,		2,		8Rnd_9x18_Makarov},
-	{Loot_MAGAZINE,		2,		7Rnd_45ACP_1911},
-	{Loot_MAGAZINE,		1,		6Rnd_45ACP},
-	{Loot_MAGAZINE,		1,		equip_string},
-	{Loot_MAGAZINE,		1,		equip_duct_tape},
-	{Loot_MAGAZINE,		1,		equip_rope},
-	{Loot_MAGAZINE,		1,		equip_nails}
-};
+Generic[] =
+{
+	{Loot_MAGAZINE,		1,		1Rnd_Arrow_Wood},
+	{Loot_MAGAZINE,		1,		HandRoadFlare},
+	{Loot_MAGAZINE,		1,		HandChemGreen},
+	{Loot_MAGAZINE,		1,		HandChemBlue},
+	{Loot_MAGAZINE,		1,		HandChemRed},
+	{Loot_MAGAZINE,		1,		5Rnd_17HMR},
+	{Loot_MAGAZINE,		2,		10Rnd_303British},
+	{Loot_MAGAZINE,		2,		15Rnd_W1866_Slug},
+	{Loot_MAGAZINE,		2,		5Rnd_762x54_Mosin},
+	{Loot_MAGAZINE,		2,		8Rnd_9x18_Makarov},
+	{Loot_MAGAZINE,		2,		7Rnd_45ACP_1911},
+	{Loot_MAGAZINE,		2,		6Rnd_45ACP},
+	{Loot_MAGAZINE,		1,		ItemDocument},
+	{Loot_GROUP,		1,		FuelCan}
+};
+
+tents[] = {
+	{Loot_MAGAZINE,		1,		ItemDomeTent},
+	{Loot_MAGAZINE,		1,		ItemTent},
+	{Loot_MAGAZINE,		1,		ItemDesertTent} //EPOCH ADDITION
+};
+
+GenericSmall[] =
+{	
+	{Loot_MAGAZINE,		1,		HandRoadFlare},
+	{Loot_MAGAZINE,		1,		HandChemGreen},
+	{Loot_MAGAZINE,		1,		HandChemBlue},
+	{Loot_MAGAZINE,		1,		HandChemRed},
+	{Loot_MAGAZINE,		1,		5Rnd_17HMR},
+	{Loot_MAGAZINE,		2,		10Rnd_303British},
+	{Loot_MAGAZINE,		2,		15Rnd_W1866_Slug},
+	{Loot_MAGAZINE,		1,		5Rnd_762x54_Mosin},
+	{Loot_MAGAZINE,		2,		8Rnd_9x18_Makarov},
+	{Loot_MAGAZINE,		2,		7Rnd_45ACP_1911},
+	{Loot_MAGAZINE,		1,		6Rnd_45ACP}
+};
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/InfectedCamp.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/InfectedCamp.hpp
index 2c0bcd84a..ff04922b2 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/InfectedCamp.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/InfectedCamp.hpp
@@ -1,3 +1,5 @@
+// Loot is inserted into tents so no "weaponholder_" type tools here.
+
 InfectedCampType[] =
 {
 	{Loot_NONE,			1,		Camp1_Small},
@@ -29,20 +31,19 @@ InfectedCampWreck[] =
 InfectedCamp[] =
 {
 	//Tools
-	{Loot_WEAPON,		7,		ItemWatch},
-	{Loot_WEAPON,		3,		ItemCompass},
-	{Loot_WEAPON,		7,		ItemFlashlight},
-	{Loot_WEAPON,		5,		ItemKnife},
-	{Loot_WEAPON,		4,		Binocular},
-	{Loot_WEAPON,		8,		ItemCrowbar},
+	{Loot_WEAPON,		1,		ItemWatch},
+	{Loot_WEAPON,		1,		ItemCompass},
+	{Loot_WEAPON,		1,		ItemFlashlight},
+	{Loot_WEAPON,		1,		ItemKnife},
+	{Loot_WEAPON,		1,		Binocular},
+	{Loot_WEAPON,		1,		ItemCrowbar},
 	
 	//Pistols
-	{Loot_GROUP,		10,		pistols},
+	{Loot_GROUP,		5,		pistols},
 
-	//Rifles
-	{Loot_GROUP,		6,		assaultrifles},
-	{Loot_GROUP,		8,		farmweapons},
-	{Loot_WEAPON,		2,		Mosin_DZ},
+	//Weapons
+	{Loot_GROUP,		10,		shotgunsingleshot},
+	{Loot_GROUP,		1,		Chainsaws},
 	{Loot_WEAPON,		4,		Crossbow_DZ},
 	{Loot_WEAPON,		5,		MeleeBaseBallBat},
 	
@@ -56,9 +57,10 @@ InfectedCamp[] =
 	{Loot_MAGAZINE,		2,		ItemBookBible},
 	
 	//Groups
-	{Loot_GROUP,		30,		MedicalLow},
-	{Loot_GROUP,		20,		MedicalHigh},
+	{Loot_GROUP,		15,		MedicalLow},
+	{Loot_GROUP,		10,		MedicalHigh},
+	{Loot_GROUP,		10,		AmmoCivilian},
 	{Loot_GROUP,		10,		Parts},
-	{Loot_GROUP,		100,	Consumable},
+	{Loot_GROUP,		30,		Consumable},
 	{Loot_WEAPON,		3,		ItemMatchbox}
-};
\ No newline at end of file
+};
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Medical.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Medical.hpp
index edf64097e..71f00f267 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Medical.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Medical.hpp
@@ -1,57 +1,43 @@
-MedicalLow[] =
-{
-	{Loot_MAGAZINE,		8,		ItemBandage},
-	{Loot_MAGAZINE,		5,		ItemPainkiller},
-	{Loot_MAGAZINE,		4,		ItemMorphine},
-	{Loot_MAGAZINE,		3,		ItemEpinephrine},
-	{Loot_MAGAZINE,		4,		ItemAntibacterialWipe},
-	{Loot_MAGAZINE,		4,		ItemHeatPack}
-};
-
-MedicalHigh[] =
-{
-	{Loot_MAGAZINE,		5,		ItemMorphine},
-	{Loot_MAGAZINE,		3,		ItemBloodTester},
-	{Loot_MAGAZINE,		5,		ItemHeatPack},
-	{Loot_MAGAZINE,		2,		ItemBloodbagEmpty},
-	
-	{Loot_GROUP,		2,		Antibiotics},
-	{Loot_GROUP,		6,		Bloodbags},
-	
-	{Loot_GROUP,		7,		MedicalLow}
-};
-
-MedicalBox[] =
-{
-	{Loot_MAGAZINE,		5,		ItemMorphine},
-	{Loot_MAGAZINE,		3,		ItemBloodTester},
-	{Loot_MAGAZINE,		5,		ItemHeatPack},
-	{Loot_MAGAZINE,		2,		ItemBloodbagEmpty},
-	
-	{Loot_GROUP,		1,		Antibiotics},
-	{Loot_GROUP,		15,		Bloodbags},
-	
-	{Loot_GROUP,		7,		MedicalLow}
-};
-
-Antibiotics[] =
-{
-	{Loot_MAGAZINE,		1,		ItemAntibiotic3},
-	{Loot_MAGAZINE,		3,		ItemAntibiotic2},
-	{Loot_MAGAZINE,		5,		ItemAntibiotic1}
-};
-
-Bloodbags[] =
-{
-	{Loot_MAGAZINE,		5,		ItemBloodbagAPos},
-	{Loot_MAGAZINE,		4,		ItemBloodbagANeg},
-	
-	{Loot_MAGAZINE,		5,		ItemBloodbagBPos},
-	{Loot_MAGAZINE,		4,		ItemBloodbagBNeg},
-	
-	{Loot_MAGAZINE,		2,		ItemBloodbagABPos},
-	{Loot_MAGAZINE,		2,		ItemBloodbagABNeg},
-	
-	{Loot_MAGAZINE,		2,		ItemBloodbagOPos},
-	{Loot_MAGAZINE,		1,		ItemBloodbagONeg}
+MedicalLow[] =
+{
+	{Loot_MAGAZINE,		5,		ItemBandage},
+	{Loot_MAGAZINE,		3,		ItemPainkiller},
+	{Loot_MAGAZINE,		3,		ItemMorphine},
+	{Loot_MAGAZINE,		1,		ItemEpinephrine},
+	{Loot_MAGAZINE,		2,		ItemAntibacterialWipe},
+	{Loot_MAGAZINE,		1,		ItemHeatPack}
+};
+
+MedicalHigh[] =
+{
+	{Loot_MAGAZINE,		1,		bloodTester},
+	{Loot_MAGAZINE,		1,		emptyBloodBag},
+	{Loot_GROUP,		3,		Antibiotics},
+	{Loot_GROUP,		15,		Bloodbags},
+	{Loot_GROUP,		8,		MedicalLow}
+};
+
+MedicalBox[] =
+{
+	{Loot_GROUP,		5,		MedicalHigh},
+	{Loot_GROUP,		1,		MedicalLow}
+};
+
+Antibiotics[] =
+{
+	{Loot_MAGAZINE,		1,		ItemAntibiotic3},
+	{Loot_MAGAZINE,		3,		ItemAntibiotic2},
+	{Loot_MAGAZINE,		5,		ItemAntibiotic1}
+};
+
+Bloodbags[] =
+{
+	{Loot_MAGAZINE,		5,		bloodBagAPOS},
+	{Loot_MAGAZINE,		4,		bloodBagANEG},
+	{Loot_MAGAZINE,		5,		bloodBagBPOS},
+	{Loot_MAGAZINE,		4,		bloodBagBNEG},
+	{Loot_MAGAZINE,		2,		bloodBagABPOS},
+	{Loot_MAGAZINE,		2,		bloodBagABNEG},
+	{Loot_MAGAZINE,		2,		bloodBagOPOS},
+	{Loot_MAGAZINE,		1,		bloodBagONEG}
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Parts.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Parts.hpp
index 50e16caea..38551acac 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Parts.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Parts.hpp
@@ -1,8 +1,9 @@
+// In order to fix up a vehicle more wheels and glass are required, so they have higher weights.
 Parts[] =
 {
-	{Loot_MAGAZINE,		5,		PartGeneric},
+	{Loot_MAGAZINE,		1,		PartGeneric},
 	{Loot_MAGAZINE,		3,		PartGlass},
-	{Loot_MAGAZINE,		2,		PartFueltank},
-	{Loot_MAGAZINE,		2,		PartWheel},
+	{Loot_MAGAZINE,		1,		PartFueltank},
+	{Loot_MAGAZINE,		3,		PartWheel},
 	{Loot_MAGAZINE,		1,		PartEngine}
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Tools.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Tools.hpp
new file mode 100644
index 000000000..bf1fd0d9a
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Tools.hpp
@@ -0,0 +1,38 @@
+// This file was created to group tools into different categories
+// Melee weapons hatchet, machete, crowbar, and baseball bat added directly to building loot.
+
+// This list contains small tools that can spawn anywhere
+ToolsSurvival[] =
+{
+	{Loot_TOOL,		1,		ItemKnife},
+	{Loot_TOOL,		1,		ItemMap},
+	{Loot_TOOL,		1,		ItemWatch},
+	{Loot_TOOL,		1,		ItemCompass},
+	{Loot_TOOL,		1,		ItemMatchbox},
+	{Loot_TOOL,		1,		ItemFlashlight},
+	{Loot_TOOL,		1,		Binocular}
+};
+
+// This list contains large tools that should not be called in small groups
+ToolsBuilding[] =
+{
+	{Loot_TOOL,		1,		ItemSledge}, // Sledge hammer should be a bit more rare than everything else.
+	{Loot_MAGAZINE,	2,		ItemSledgeHandle},
+	{Loot_MAGAZINE,	2,		ItemSledgeHead},
+	{Loot_TOOL,		3,		ItemKeyKit},
+	{Loot_TOOL,		6,		ItemToolbox},
+	{Loot_TOOL,		4,		ItemEtool}
+};
+
+// Small tools that can spawn anywhere
+ToolsMilitary[] =
+{
+	{Loot_TOOL,		1,		ItemKnife},
+	{Loot_TOOL,		1,		ItemGPS},
+	{Loot_TOOL,		1,		ItemCompass},
+	{Loot_TOOL,		1,		ItemFlashlightRed},
+	{Loot_TOOL,		1,		Binocular},
+	{Loot_TOOL,		1,		NVGoggles},
+	{Loot_TOOL,		1,		Binocular_Vector},
+	{Loot_TOOL,		1,		ItemEtool}
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Vanilla.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Vanilla.hpp
new file mode 100644
index 000000000..7072264b8
--- /dev/null
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Vanilla.hpp
@@ -0,0 +1,39 @@
+// Grouping Vanilla Mod specific items together because they have limited use in Epoch and should be called sporadically.
+// DayZ Mod base building is not enabled in Epoch so there is no reason to spawn many of these items.
+// skigoggles posted a list of unused (junk) items here: https://helpthedeadreturn.wordpress.com/2015/12/08/items-of-dubious-value-junk/ 
+
+VanillaSurvival[] =
+{
+//	{Loot_MAGAZINE,		1,		equip_pvc_box},  // Unused
+//	{Loot_MAGAZINE,		1,		ItemBookBible}, // Novelty church item - added directly to church loot
+//	{Loot_MAGAZINE,		1,		PartWoodPile}, // Build a fire -  In Epoch these can be easily harvested from trees
+//	{Loot_MAGAZINE,		1,		equip_rope}, // Only appears to be used to craft string
+	{Loot_MAGAZINE,		1,		equip_rag}, // Used to craft bandages and makeshift backpack
+	{Loot_MAGAZINE,		1,		equip_string}, // Used in multiple crafting recipes
+	{Loot_MAGAZINE,		1,		equip_duct_tape}, // Repair broken stuff - craft a sling
+	{Loot_MAGAZINE,		1,		equip_herb_box}, // Combine with ItemWaterBottle to make Herbal Tea
+	{Loot_MAGAZINE,		1,		equip_nails}, // Combine with baseball bat - Vanilla base building
+	{Loot_MAGAZINE,		1,		equip_hose} // Need this to siphon gas with fuel container - very useful
+};
+
+VanillaConstruction[] =
+{
+//	{Loot_MAGAZINE,		1,		equip_scrapelectronics}, // Unused
+//	{Loot_MAGAZINE,		2,		equip_1inch_metal_pipe}, // Unused
+//	{Loot_MAGAZINE,		2,		equip_2inch_metal_pipe}, // Unused
+//	{Loot_WEAPON,		2,		ItemShovel}, // Has no function in Epoch
+//	{Loot_WEAPON,		1,		WeaponHolder_ItemPickaxe}, // Get ItemStone from rocks on the map - no function in Epoch.
+//	{Loot_WEAPON,		2,		WeaponHolder_ItemPickaxeBroken},
+//	{Loot_MAGAZINE,		9,		equip_metal_sheet}, // Vanilla base building
+//	{Loot_MAGAZINE,		9,		equip_metal_sheet_rusted}, // Unused
+//	{Loot_MAGAZINE,		4,		ItemScrews}, // Vanilla base building
+//	{Loot_MAGAZINE,		5,		ItemStone}, // Vanilla base building - foundations
+//	{Loot_WEAPON,		1,		ItemDIY_wood}, // Vanilla base building
+//	{Loot_WEAPON,		1,		ItemDIY_Gate} // Vanilla base building
+	{Loot_MAGAZINE,		1,		equip_hose}, // Need this to siphon gas with fuel container - very useful
+	{Loot_MAGAZINE,		1,		equip_lever}, // Repair broken handles if dayz_toolBreaking enabled
+	{Loot_MAGAZINE,		1,		ItemPlank}, // Vanilla base building -  craft a sling
+	{Loot_MAGAZINE,		1,		equip_nails}, // Combine with baseball bat - Vanilla base building
+	{Loot_MAGAZINE,		1,		equip_brick}, // Used to sharpen tools if dayz_knifeDulling enabled
+	{Loot_MAGAZINE,		1,		ItemLog} // Make a fire, make ItemPlank
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
index d34215562..7a4aa998f 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Weapons.hpp
@@ -1,139 +1,193 @@
-//{Loot_GROUP,		2,		pistols},
-//{Loot_GROUP,		2,		shotgunsingleshot},
-//{Loot_GROUP,		2,		farmweapons},
-//{Loot_GROUP,		2,		sniperrifles},
-//{Loot_GROUP,		2,		submachinegun},
-//{Loot_GROUP,		2,		assaultrifles},
-//{Loot_GROUP,		2,		militaryshotguns},
-pistols[] = {
-	{Loot_WEAPON,		2,		Makarov_DZ}, //Makarov
-	{Loot_WEAPON,		2,		M1911_DZ}, //Colt1911
-	{Loot_WEAPON,		1.5,	Revolver_DZ}, //revolver_EP1
-	{Loot_WEAPON,		1,		G17_DZ}, //glock17_EP1
-	{Loot_WEAPON,		1,		Makarov_SD_DZ}, //MakarovSD
-	{Loot_WEAPON,		0.7,	M9_DZ}, //M9
-	{Loot_WEAPON,		0.5,	M9_SD_DZ}, //M9SD
-	{Loot_WEAPON,		0.1,	revolver_gold_EP1}
-};
-shotgunsingleshot[] = {
-	{Loot_WEAPON,		2,		Winchester1866_DZ}, //Winchester1866
-	{Loot_WEAPON,		1.7,	LeeEnfield_DZ}, //LeeEnfield
-	{Loot_WEAPON,		1.7,	MR43_DZ}, //MR43
-	{Loot_WEAPON,		1,		Saiga12K},
-	{Loot_WEAPON,		1,		Remington870_DZ}, //Remington870_lamp
-	{Loot_WEAPON,		1,		Crossbow_DZ},
-	{Loot_WEAPON,		1,		RedRyder},
-	{Loot_WEAPON,		1,		M1014_DZ} //M1014
-};
-Chainsaws[] = {
-	{Loot_WEAPON,		1,		ChainSaw},
-	{Loot_WEAPON,		1,		ChainSawB},
-	{Loot_WEAPON,		1,		ChainSawG},
-	{Loot_WEAPON,		1,		ChainSawP},
-	{Loot_WEAPON,		1,		ChainSawR}
-};
-farmweapons[] = {
-	{Loot_GROUP,		5,		shotgunsingleshot},
-	{Loot_WEAPON,		2,		CZ550_DZ}, //huntingrifle
-	{Loot_GROUP,		0.3,	Chainsaws},
-	{Loot_WEAPON,		2,		RedRyder},
-	{Loot_WEAPON,		3,		Mosin_DZ}
-};
-sniperrifles[] = {
-	{Loot_WEAPON,		1,		AK_107_PSO},
-	{Loot_WEAPON,		0.9,	M4SPR},
-	{Loot_WEAPON,		0.9,	M40A3_DZ}, //M40A3
-	{Loot_WEAPON,		0.7,	SVD_PSO1_Gh_DZ},
-	{Loot_WEAPON,		0.7,	SVD_PSO1_DZ},
-	{Loot_WEAPON,		1,		CZ550_DZ}, //huntingrifle
-	{Loot_WEAPON,		0.8,	M24_des_EP1},
-	{Loot_WEAPON,		0.8,	M24_DZ}, //M24
-	{Loot_WEAPON,		0.6,	BAF_LRR_scoped},
-	{Loot_WEAPON,		0.6,	BAF_LRR_scoped_W},
-	{Loot_WEAPON,		0.5,	M107_DZ},
-	{Loot_WEAPON,		0.5,	KSVK_DZE},
-	{Loot_WEAPON,		0.5,	VSS_vintorez},
-	{Loot_WEAPON,		0.6,	SCAR_H_LNG_Sniper_SD},
-	{Loot_WEAPON,		1,		M14_DZ}, //M14_EP1
-	{Loot_WEAPON,		0.7,		DMR_DZ}, //DMR
-	{Loot_WEAPON,		0.8,	SCAR_H_LNG_Sniper}, //Mk17 Sniper
-	{Loot_WEAPON,		0.6,	M110_NVG_EP1} //M110 NVG
-};
-submachinegun[] = {
-	{Loot_WEAPON,		2,		PDW_DZ}, //UZI_EP1
-	{Loot_WEAPON,		1.5,	Bizon_DZ}, //bizon
-	{Loot_WEAPON,		1.5,	Sa61_EP1},
-	{Loot_WEAPON,		1,		MP5_DZ}, //MP5A5
-	{Loot_WEAPON,		1,		Bizon_SD_DZ}, //bizon_silenced
-	{Loot_WEAPON,		0.8,	UZI_SD_EP1},
-	{Loot_WEAPON,		0.7,	MP5_SD_DZ} //MP5SD
-};
-assaultrifles[] = {
-	{Loot_WEAPON,		0.5,		AK74_Kobra_DZ}, //AKS_74_kobra (stock is slightly different, otherwise identical)
-	{Loot_WEAPON,		0.5,		AKS74U_DZ}, //AKS_74_U
-	{Loot_WEAPON,		0.1,		AKS_GOLD},
-	{Loot_WEAPON,		0.5,		AKM_DZ}, //AK_47_M
-	{Loot_WEAPON,		0.5,		AK74_DZ}, //AK_74
-	{Loot_WEAPON,		0.5,		AK107_DZ}, //AK_107
-	{Loot_WEAPON,		0.3,		FNFAL_DZ}, //FN_FAL
-	{Loot_WEAPON,		0.1,		FN_FAL_ANPVS4_DZE}, //FNFAL_ANPVS4_DZ is NV only _DZE is toggleable
-	{Loot_WEAPON,		0.5,		G36A_Camo_DZ}, //G36A_camo
-	{Loot_WEAPON,		0.5,		G36C_DZ}, //G36C
-	{Loot_WEAPON,		0.4,		G36C_camo},
-	{Loot_WEAPON,		0.5,		G36K_Camo_DZ}, //G36K_camo
-	{Loot_WEAPON,		0.2,		G36_C_SD_camo},
-	{Loot_WEAPON,		0.5,		M16A2_DZ}, //M16A2
-	//{Loot_WEAPON,		0.2,		M16A2_GL_DZ}, //M16A2GL //added to attachments system
-	{Loot_WEAPON,		0.1,		M16A4_ACOG_DZ}, //M16A4_ACG (has slightly different scope)
-	{Loot_WEAPON,		0.5,		M4A1_DZ}, //M4A1
-	{Loot_WEAPON,		0.4,		M4A1_CCO_DZ}, //M4A1_Aim
-	{Loot_WEAPON,		0.1,		M4A1_AIM_SD_camo},
-	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_camo},
-	{Loot_WEAPON,		0.3,		M4A3_CCO_EP1},
-	{Loot_WEAPON,		0.4,		SA58_DZ}, //Sa58P_EP1 (identical), Sa58V_EP1 (different stock)
-	{Loot_WEAPON,		0.3,		SA58_CCO_DZ}, //No camo, no grip handle
-	{Loot_WEAPON,		0.2,		Sa58V_CCO_EP1}, //Camo with grip handle
-	{Loot_WEAPON,		0.3,		SA58_ACOG_DZ}, //No camo, no grip handle
-	{Loot_WEAPON,		0.2,		Sa58V_RCO_EP1}, // Camo with grip handle
-	{Loot_WEAPON,		0.3,		SA58_RIS_DZ}, //SA58_DZ with different rail
-	{Loot_WEAPON,		0.3,		m8_compact},
-	{Loot_WEAPON,		0.2,		m8_sharpshooter},
-	{Loot_WEAPON,		0.2,		m8_holo_sd},
-	{Loot_WEAPON,		0.3,		m8_carbine},
-	{Loot_WEAPON,		0.5,		L85A2_DZ},
-	{Loot_WEAPON,		0.1,		M4A1_HWS_GL_SD_Camo},
-	//Mk16
-	{Loot_WEAPON,		0.2,		SCAR_L_CQC_CCO_SD}, //Mk16 Aimpoint SD 
-	{Loot_WEAPON,		0.3,		SCAR_L_CQC}, //Mk16 CQC 
-	{Loot_WEAPON,		0.3,		SCAR_L_CQC_Holo}, //Mk16 CQC EOTech 
-	{Loot_WEAPON,		0.2,		SCAR_L_CQC_EGLM_Holo}, //Mk16 EGLM EOTech,(40mm)
-	{Loot_WEAPON,		0.2,		SCAR_L_STD_EGLM_RCO}, //Mk16 EGLM RCO,(40mm)
-	{Loot_WEAPON,		0.3,		SCAR_L_STD_HOLO}, //Mk16 EOTech 
-	{Loot_WEAPON,		0.3,		SCAR_L_STD_Mk4CQT}, //Mk16 Mk4CQ/T 
-	//Mk17
-	{Loot_WEAPON,		0.1,		SCAR_H_CQC_CCO}, //Mk17 Aimpoint
-	{Loot_WEAPON,		0.1,		SCAR_H_CQC_CCO_SD}, //Mk17 Aimpoint SD 
-	{Loot_WEAPON,		0.1,		SCAR_H_STD_EGLM_Spect} //Mk17 EGLM ACOG,(40mm)	
-};
-machineguns[] = {
-	{Loot_WEAPON,		1.1,	RPK74_DZ}, //RPK_74
-	{Loot_WEAPON,		1.1,	M8_SAW},
-	{Loot_WEAPON,		1,		Pecheneg_DZ},
-	{Loot_WEAPON,		1,		PKM_DZ}, //PK_DZ
-	{Loot_WEAPON,		0.9,	L110A1_DZ}, //BAF_L110A1_Aim_DZE scope is slightly different from L110A1_CCO_DZ, otherwise identical
-	{Loot_WEAPON,		0.9,		MG36_camo},
-	{Loot_WEAPON,		1,		M60A4_EP1_DZE},
-	{Loot_WEAPON,		1,		MG36},
-	{Loot_WEAPON,		1,		M249_m145_EP1_DZE},
-	{Loot_WEAPON,		1,		m240_scoped_EP1_DZE},
-	{Loot_WEAPON,		0.8,	M240_DZ},
-	{Loot_WEAPON,		0.9,	M249_DZ},
-	{Loot_WEAPON,		0.5,	Mk48_DZ}, //Mk_48_DZ (removed, was a duplicate of Mk48_CCO_DZ)
-	{Loot_WEAPON,		0.9,	BAF_L86A2_ACOG} //L86A2 ACOG
-};
-militaryshotguns[] = {
-	{Loot_WEAPON,		2,		Saiga12K},
-	{Loot_WEAPON,		2,		Remington870_FL_DZ}, //Remington870_lamp
-	{Loot_WEAPON,		2,		M1014_DZ}, //M1014
-	{Loot_WEAPON,		1,		AA12_PMC} //AA12 Shotgun
-};
+// Weapons are organized in matching groups US,RU,CZ,EU, and Residential.
+// Pistols also spawn in small groups so they are given smaller weights here.
+
+weaponsRU[] =
+{
+	// Pistols
+	{Loot_WEAPON,		2,		Makarov_DZ},
+	{Loot_WEAPON,		1,		Makarov_SD_DZ},
+	
+	// Bolt action rifles and shotguns
+	{Loot_WEAPON,		5,		Saiga12K},
+	{Loot_WEAPON,		5,		Mosin_PU_DZ},
+	
+	// Sniper Rifles
+	{Loot_WEAPON,		4,		SVD_des_EP1},
+	{Loot_WEAPON,		4,		SVD_DZ},
+	{Loot_WEAPON,		4,		VSS_vintorez},
+	{Loot_WEAPON,		1,		KSVK_DZE}, // High value weapon, low spawn chance.
+	{Loot_WEAPON,		1,		Anzio_20_DZ}, // High value weapon, low spawn chance.
+	
+	// Submachine Guns
+	{Loot_WEAPON,		7,		Bizon_DZ},
+	{Loot_WEAPON,		7,		Bizon_SD_DZ},
+	
+	// Assault Rifles
+	{Loot_WEAPON,		6,		AK74_Kobra_DZ},
+	{Loot_WEAPON,		6,		AKS74U_DZ},
+	{Loot_WEAPON,		1,		AKS_GOLD},
+	{Loot_WEAPON,		6,		AKM_DZ},
+	{Loot_WEAPON,		6,		AK107_DZ}, // Attachment support added to AK-107 in 1.0.7
+	{Loot_WEAPON,		6,		AK74_DZ},
+	
+	// Machine Guns
+	{Loot_WEAPON,		3,		RPK74_DZ},
+	{Loot_WEAPON,		2,		Pecheneg_DZ},
+	{Loot_WEAPON,		3,		RPK_DZ},
+	{Loot_WEAPON,		3,		PKM_DZ}
+};
+
+weaponsUS[] =
+{
+	// Pistols
+	{Loot_WEAPON,		1,		M9_DZ},
+	{Loot_WEAPON,		2,		M9_SD_DZ},
+	
+	// Bolt action rifles and shotguns
+	{Loot_WEAPON,		5,		Remington870_DZ},
+	{Loot_WEAPON,		5,		AA12_PMC},
+	
+	// Sniper Rifles
+	{Loot_WEAPON,		5,		M4SPR},
+	{Loot_WEAPON,		4,		M40A3_DZ},
+	{Loot_WEAPON,		4,		M24_des_EP1},
+	{Loot_WEAPON,		4,		M24_DZ},
+	{Loot_WEAPON,		4,		M14_DZ},
+	{Loot_WEAPON,		3,		DMR_DZ},
+	{Loot_WEAPON,		1,		M107_DZ}, // High value weapon, low spawn chance.
+	
+	// Submachine Guns
+	{Loot_WEAPON,		3,		PDW_DZ},
+	{Loot_WEAPON,		3,		UZI_SD_EP1},
+	
+	// Assault Rifles
+	{Loot_WEAPON,		6,		M16A2_DZ},
+	{Loot_WEAPON,		6,		M16A4_ACOG_DZ},
+	{Loot_WEAPON,		6,		M4A1_DZ},
+	{Loot_WEAPON,		6,		M4A1_AIM_SD_camo},
+	{Loot_WEAPON,		6,		M4A1_HWS_GL_camo},
+	{Loot_WEAPON,		6,		M4A3_CCO_EP1},
+	{Loot_WEAPON,		6,		M4A1_HWS_GL_SD_Camo},
+	
+	// Machine Guns
+	{Loot_WEAPON,		3,		M60A4_EP1_DZE},
+	{Loot_WEAPON,		5,		M249_m145_EP1_DZE},
+	{Loot_WEAPON,		3,		m240_scoped_EP1_DZE},
+	{Loot_WEAPON,		3,		M240_DZ},
+	{Loot_WEAPON,		5,		M249_DZ}
+};
+
+weaponsEU[] =
+{
+	// Pistols
+	{Loot_WEAPON,		2,		G17_DZ},
+	{Loot_WEAPON,		1,		G17_SD_DZ},
+	
+	// Bolt action rifles and shotguns
+	{Loot_WEAPON,		5,		LeeEnfield_DZ},
+	{Loot_WEAPON,		5,		M1014_DZ},
+	
+	// Sniper Rifles
+	{Loot_WEAPON,		1,		L115A3_DZ}, // Tan Lapua
+	{Loot_WEAPON,		1,		L115A3_2_DZ}, // Green Lapua
+	{Loot_WEAPON,		4,		SCAR_H_LNG_Sniper_SD},
+	{Loot_WEAPON,		4,		SCAR_H_LNG_Sniper},
+	{Loot_WEAPON,		4,		FNFAL_DZ},
+	{Loot_WEAPON,		3,		FN_FAL_ANPVS4_DZE}, //FNFAL_ANPVS4_DZ is NV only _DZE is toggleable
+	{Loot_WEAPON,		1,		BAF_AS50_scoped_DZ}, // High value weapon, low spawn chance.
+	
+	// Submachine Guns
+	{Loot_WEAPON,		7,		MP5_DZ},
+	{Loot_WEAPON,		7,		MP5_SD_DZ},
+	
+	// Assault Rifles
+	{Loot_WEAPON,		5,		G36A_Camo_DZ},
+	{Loot_WEAPON,		5,		G36C_DZ},
+	{Loot_WEAPON,		5,		G36C_camo},
+	{Loot_WEAPON,		5,		G36K_Camo_DZ},
+	{Loot_WEAPON,		5,		G36_C_SD_camo},
+	{Loot_WEAPON,		5,		m8_compact},
+	{Loot_WEAPON,		5,		m8_sharpshooter},
+	{Loot_WEAPON,		5,		m8_holo_sd},
+	{Loot_WEAPON,		5,		m8_carbine},
+	{Loot_WEAPON,		5,		L85A2_DZ},
+	{Loot_WEAPON,		5,		SCAR_L_CQC_CCO_SD},
+	{Loot_WEAPON,		5,		SCAR_L_CQC},
+	{Loot_WEAPON,		5,		SCAR_L_CQC_Holo},
+	{Loot_WEAPON,		5,		SCAR_L_CQC_EGLM_Holo},
+	{Loot_WEAPON,		5,		SCAR_L_STD_EGLM_RCO},
+	{Loot_WEAPON,		5,		SCAR_L_STD_HOLO},
+	{Loot_WEAPON,		5,		SCAR_L_STD_Mk4CQT},
+	{Loot_WEAPON,		3,		SCAR_H_CQC_CCO},
+	{Loot_WEAPON,		3,		SCAR_H_CQC_CCO_SD},
+	{Loot_WEAPON,		3,		SCAR_H_STD_EGLM_Spect},
+	
+	// Machine Guns
+	{Loot_WEAPON,		6,		M8_SAW},
+	{Loot_WEAPON,		4,		L110A1_DZ},
+	{Loot_WEAPON,		4,		MG36_camo},
+	{Loot_WEAPON,		4,		MG36},
+	{Loot_WEAPON,		3,		Mk48_DZ},
+	{Loot_WEAPON,		5,		BAF_L86A2_ACOG}
+};
+
+weaponsCZ[] = 
+{
+	// Pistols
+	{Loot_WEAPON,		2,		CZ_75_P_07_DUTY},
+	{Loot_WEAPON,		2,		CZ_75_D_COMPACT},
+	{Loot_WEAPON,		2,		CZ_75_SP_01_PHANTOM},
+	{Loot_WEAPON,		1,		CZ_75_SP_01_PHANTOM_SD},
+	
+	// Sniper Rifles
+	{Loot_WEAPON,		3,		CZ_750_S1_ACR},
+	{Loot_WEAPON,		3,		M110_NVG_EP1}, // Technically a US rifle, but the CZ group does not have a DMR type rifle.
+	
+	// Submachine Guns
+	{Loot_WEAPON,		7,		Evo_ACR},
+	{Loot_WEAPON,		7,		Evo_mrad_ACR},
+	{Loot_WEAPON,		5,		evo_sd_ACR},
+	
+	// Assault Rifles
+	{Loot_WEAPON,		6,		SA58_DZ},
+	{Loot_WEAPON,		6,		Sa58V_CCO_EP1},
+	{Loot_WEAPON,		6,		Sa58V_RCO_EP1},
+	{Loot_WEAPON,		6,		SA58_RIS_DZ},
+	{Loot_WEAPON,		6,		CZ805_A1_ACR},
+	{Loot_WEAPON,		6,		CZ805_A1_GL_ACR},
+	{Loot_WEAPON,		6,		CZ805_A2_ACR},
+	{Loot_WEAPON,		6,		CZ805_A2_SD_ACR},
+	{Loot_WEAPON,		3,		CZ805_B_GL_ACR}, // 7.62x51, uses SCAR mags.
+	
+	// Machine Gun
+	{Loot_WEAPON,		6,		UK59_DZ}
+	
+	
+};
+
+pistols[] = { // Residential spawns
+	{Loot_WEAPON,		7,		Makarov_DZ},
+	{Loot_WEAPON,		5,		M1911_DZ},
+	{Loot_WEAPON,		3,		Revolver_DZ},
+	{Loot_WEAPON,		1,		revolver_gold_EP1}
+};
+
+
+shotgunsingleshot[] = { // Residential Spawns
+	{Loot_WEAPON,		2,		Winchester1866_DZ},
+	{Loot_WEAPON,		2,		Remington870_DZ},
+	{Loot_WEAPON,		2,		LeeEnfield_DZ},
+	{Loot_WEAPON,		3,		MR43_DZ},
+	{Loot_WEAPON,		3,		Crossbow_DZ},
+	{Loot_WEAPON,		3,		RedRyder},
+	{Loot_WEAPON,		1,		CZ550_DZ},
+	{Loot_WEAPON,		1,		Mosin_DZ}
+};
+
+Chainsaws[] = {
+	{Loot_WEAPON,		1,		ChainSaw},
+	{Loot_WEAPON,		1,		ChainSawB},
+	{Loot_WEAPON,		1,		ChainSawG},
+	{Loot_WEAPON,		1,		ChainSawP},
+	{Loot_WEAPON,		1,		ChainSawR}
+};
diff --git a/SQF/dayz_code/Configs/CfgLoot/Groups/Wrecks.hpp b/SQF/dayz_code/Configs/CfgLoot/Groups/Wrecks.hpp
index 3b523f6e5..9e6cb4b66 100644
--- a/SQF/dayz_code/Configs/CfgLoot/Groups/Wrecks.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/Groups/Wrecks.hpp
@@ -1,29 +1,23 @@
 Land_iron_vein_wreck[] =
 {
-	{Loot_MAGAZINE,85,PartOre,10,10},
-	{Loot_MAGAZINE,10,PartOreSilver,0,10},
-	{Loot_MAGAZINE,5,PartOreGold,0,5}
+	{Loot_MAGAZINE,		1,		PartOre,10,10},
 };
 
 Land_silver_vein_wreck[] =
 {
-	{Loot_MAGAZINE,80,PartOreSilver,10,10},
-	{Loot_MAGAZINE,15,PartOreGold,2,6},
-	{Loot_MAGAZINE,5,PartOre,0,1}
+	{Loot_MAGAZINE,		1,		PartOreSilver,10,10}
 };
 
 Land_gold_vein_wreck[] =
 {
-	{Loot_MAGAZINE,80,PartOreGold,10,10},
-	{Loot_MAGAZINE,15,PartOreSilver,2,6},
-	{Loot_MAGAZINE,5,PartOre,0,1}
+	{Loot_MAGAZINE,		1,		PartOreGold,10,10},
 };
 
 Land_ammo_supply_wreck[] =
 {
-	{Loot_MAGAZINE,		20,		2000Rnd_762x51_M134},
-	{Loot_MAGAZINE,		20,		29Rnd_30mm_AGS30},
-	{Loot_MAGAZINE,		20,		50Rnd_127x107_DSHKM},
-	{Loot_MAGAZINE,		20,		48Rnd_40mm_MK19},
-	{Loot_MAGAZINE,		20,		100Rnd_127x99_M2}
+	{Loot_MAGAZINE,		1,		2000Rnd_762x51_M134},
+	{Loot_MAGAZINE,		1,		29Rnd_30mm_AGS30},
+	{Loot_MAGAZINE,		1,		50Rnd_127x107_DSHKM},
+	{Loot_MAGAZINE,		1,		48Rnd_40mm_MK19},
+	{Loot_MAGAZINE,		1,		100Rnd_127x99_M2}
 };
\ No newline at end of file