diff --git a/README.md b/README.md
index ba5763aa..ec4f33fa 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,6 @@
 
 ## Weapons
 * Switch to melee weapon by pressing the Previous Scorestreak button (same button as the Time Bomb and Maxis Drone)
-* Inspect weapon by pressing the Alt Fire button
 * Snipers: increased zoom FOV from 15 to 25
 * Snipers: disabled scope sway
 * Grenades: improved projectile upward speed
@@ -158,6 +157,7 @@
 * Unupgraded: increased stock ammo from 120 to 288
 * Upgraded: increased clip ammo from 40 to 48
 * Upgraded: increased stock ammo from 200 to 384
+* Upgraded: changed default attachment from None to Select Fire
 
 ### Executioner
 * Increased penetration
@@ -168,6 +168,7 @@
 
 ### HAMR
 * Decreased recoil
+* Upgraded: changed default attachment from None to Grip
 
 ### KAP-40
 * Removed delay between last shot and reload
@@ -186,6 +187,9 @@
 ### M1927
 * Decreased ammo cost from 800 to 750
 
+### M27
+* Upgraded: changed default attachment from Reflex Sight to None
+
 ### M8A1
 * Decreased recoil
 
@@ -203,6 +207,7 @@
 
 ### MTAR
 * Decreased recoil
+* Upgraded: changed default attachment from Reflex Sight to EOTech Sight
 
 ### Remington 870
 * Changed weapon cost from 900 or 1500 to 1200 on all maps
@@ -214,6 +219,12 @@
 ### S12
 * Increased penetration
 
+### SCAR-H
+* Upgraded: changed default attachment from Reflex Sight to None
+
+### Skorpion EVO
+* Upgraded: changed default attachment from Reflex Sight to Fast Mag
+
 ### SMR
 * Increased damage by 100%
 * Removed aim spread
@@ -226,6 +237,7 @@
 * Decreased recoil
 * Unupgraded: increased stock ammo from 150 to 300
 * Upgraded: increased stock ammo from 270 to 450
+* Upgraded: changed default attachment from Reflex Sight to Millimeter Scanner
 
 ### War Machine
 * Unupgraded: grenades explode on impact
@@ -454,7 +466,7 @@
 * Stink areas no longer activate while the player is moving
 
 ## Pack-a-Punch
-* No longer costs 2000 points to change attachments on an upgraded weapon
+* Attachments on upgraded weapons can no longer be changed
 * Decreased weapon pickup time from 15 seconds to 12 seconds
 * Added sound when attempting to purchase without enough points
 
diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc
index ba7f3fbf..78dd44f0 100644
--- a/scripts/zm/_zm_reimagined.gsc
+++ b/scripts/zm/_zm_reimagined.gsc
@@ -135,6 +135,7 @@ init()
 
 	level.using_solo_revive = 0;
 	level.claymores_max_per_player = 20;
+	level.zombiemode_reusing_pack_a_punch = 0;
 	level.navcards = undefined; // removes navcards on HUD
 	level.powerup_intro_vox = undefined;
 	level.player_too_many_players_check = 0;
@@ -183,7 +184,6 @@ on_player_connect()
 		player thread on_player_fake_revive();
 
 		player thread grenade_fire_watcher();
-		player thread weapon_inspect_watcher();
 	}
 }
 
@@ -1826,47 +1826,6 @@ smoke_grenade_cluster(owner)
 	owner.smoke_grenade_cluster = undefined;
 }
 
-weapon_inspect_watcher()
-{
-	level endon("end_game");
-	self endon("disconnect");
-
-	vars = [];
-
-	while (1)
-	{
-		wait 0.05;
-
-		if (self isSwitchingWeapons())
-		{
-			continue;
-		}
-
-		vars["curr_wep"] = self getCurrentWeapon();
-
-		vars["is_primary"] = 0;
-
-		foreach (wep in self getWeaponsListPrimaries())
-		{
-			if (wep == vars["curr_wep"])
-			{
-				vars["is_primary"] = 1;
-				break;
-			}
-		}
-
-		if (!vars["is_primary"])
-		{
-			continue;
-		}
-
-		if (self actionSlotThreeButtonPressed() && self getWeaponAmmoClip(vars["curr_wep"]) != 0)
-		{
-			self initialWeaponRaise(vars["curr_wep"]);
-		}
-	}
-}
-
 buildbuildables()
 {
 	// need a wait or else some buildables dont build
diff --git a/zm/pap_attach.csv b/zm/pap_attach.csv
new file mode 100644
index 00000000..2f92c2af
--- /dev/null
+++ b/zm/pap_attach.csv
@@ -0,0 +1,29 @@
+ak74u_upgraded_zm,reflex,,,,
+fnfal_upgraded_zm,reflex,,,,
+galil_upgraded_zm,reflex,,,,
+barretm82_upgraded_zm,vzoom,,,,
+judge_upgraded_zm,none,,,,
+kard_upgraded_zm,none,,,,
+fiveseven_upgraded_zm,none,,,,
+beretta93r_upgraded_zm,none,,,,
+qcw05_upgraded_zm,sf,,,,
+870mcs_upgraded_zm,none,,,,
+saiga12_upgraded_zm,none,,,,
+srm1216_upgraded_zm,none,,,,
+saritch_upgraded_zm,dualoptic,,,,
+xm8_upgraded_zm,reflex,,,,
+type95_upgraded_zm,mms,,,,
+tar21_upgraded_zm,longbreath,,,,
+hamr_upgraded_zm,grip,,,,
+dsr50_upgraded_zm,vzoom,,,,
+hk416_upgraded_zm,none,,,,
+lsat_upgraded_zm,rangefinder,,,,
+an94_upgraded_zm,reflex,,,,
+pdw57_upgraded_zm,none,,,,
+svu_upgraded_zm,vzoom,,,,
+ballista_upgraded_zm,acog,,,,
+ksg_upgraded_zm,reflex,,,,
+evoskorpion_upgraded_zm,dualclip,,,,
+scar_upgraded_zm,none,,,,
+ak74u_extclip_upgraded_zm,reflex,,,,
+beretta93r_extclip_upgraded_zm,none,,,,
\ No newline at end of file
diff --git a/zone_source/mod.zone b/zone_source/mod.zone
index 8c48b125..3bef7cf6 100644
--- a/zone_source/mod.zone
+++ b/zone_source/mod.zone
@@ -12,4 +12,6 @@ include,fnp45_zm
 
 include,waypoint
 
+stringtable,zm/pap_attach.csv
+
 localize,reimagined
\ No newline at end of file