diff --git a/assets/units/payday2/weapons/wpn_npc_sawnoff_shotgun/sawnoff_df.texture b/assets/units/payday2/weapons/wpn_npc_sawnoff_shotgun/sawnoff_df.texture
new file mode 100644
index 00000000..df0fc820
Binary files /dev/null and b/assets/units/payday2/weapons/wpn_npc_sawnoff_shotgun/sawnoff_df.texture differ
diff --git a/assets/units/payday2/weapons/wpn_npc_sawnoff_shotgun/sawnoff_nm.texture b/assets/units/payday2/weapons/wpn_npc_sawnoff_shotgun/sawnoff_nm.texture
new file mode 100644
index 00000000..f05383e6
Binary files /dev/null and b/assets/units/payday2/weapons/wpn_npc_sawnoff_shotgun/sawnoff_nm.texture differ
diff --git a/assets/units/payday2/weapons/wpn_npc_sawnoff_shotgun/wpn_npc_sawnoff_shotgun.model b/assets/units/payday2/weapons/wpn_npc_sawnoff_shotgun/wpn_npc_sawnoff_shotgun.model
new file mode 100644
index 00000000..70ed8cb8
Binary files /dev/null and b/assets/units/payday2/weapons/wpn_npc_sawnoff_shotgun/wpn_npc_sawnoff_shotgun.model differ
diff --git a/assets/units/payday2/weapons/wpn_npc_sawnoff_shotgun/wpn_npc_sawnoff_shotgun.unit b/assets/units/payday2/weapons/wpn_npc_sawnoff_shotgun/wpn_npc_sawnoff_shotgun.unit
deleted file mode 100644
index 0b2f5521..00000000
--- a/assets/units/payday2/weapons/wpn_npc_sawnoff_shotgun/wpn_npc_sawnoff_shotgun.unit
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<unit type="wpn" slot="13">
-	<object file="units/payday2/weapons/wpn_npc_sawnoff_shotgun/wpn_npc_sawnoff_shotgun"/>
-	<dependencies>
-		<depends_on effect="effects/particles/weapons/shotgun/muzzleflash_3dp"/>
-		<depends_on bnk="soundbanks/weapon_huntsman"/>
-	</dependencies>
-	<extensions>
-		<extension name="unit_data" class="ScriptUnitData"/>
-		<extension name="base" class="NPCShotgunBase">
-			<var name="name_id" value="mossberg_npc"/>
-		</extension>
-		<extension name="damage" class="UnitDamage"/>
-	</extensions>
-	<sounds>
-		<soundsource name="root" source="rp_mossberg"/>
-		<default_soundsource source="rp_mossberg"/>
-	</sounds>
-</unit>
\ No newline at end of file
diff --git a/lua/charactertweakdata.lua b/lua/charactertweakdata.lua
index efb55a1f..1776e12c 100644
--- a/lua/charactertweakdata.lua
+++ b/lua/charactertweakdata.lua
@@ -824,6 +824,7 @@ Hooks:PostHook(CharacterTweakData, "init", "eclipse_init", function(self)
 	self.cop.weapon = self.presets.weapon.base
 	self.gangster.weapon = self.presets.weapon.base
 	self.biker.weapon = self.presets.weapon.base
+	self.biker_female.weapon = self.presets.weapon.base
 	self.biker_escape.weapon = self.presets.weapon.base
 	self.triad.weapon = self.presets.weapon.base
 	self.mobster.weapon = self.presets.weapon.base
@@ -863,6 +864,7 @@ Hooks:PostHook(CharacterTweakData, "init", "eclipse_init", function(self)
 	-- Set chatter presets
 	self.mobster.chatter = self.presets.enemy_chatter.gangster
 	self.biker.chatter = self.presets.enemy_chatter.gangster
+	self.biker_female.chatter = self.presets.enemy_chatter.gangster
 	self.biker_escape.chatter = self.presets.enemy_chatter.gangster
 	self.bolivian.chatter = self.presets.enemy_chatter.gangster
 	self.bolivian_indoors.chatter = self.presets.enemy_chatter.gangster
diff --git a/lua/weapontweakdata.lua b/lua/weapontweakdata.lua
index 36cddb22..a4a63f6b 100644
--- a/lua/weapontweakdata.lua
+++ b/lua/weapontweakdata.lua
@@ -1729,6 +1729,7 @@ self.system.use_data.selection_index = SELECTION.UNDERBARREL_PRIMARY
 	self.benelli_npc.DAMAGE = 1
 	self.benelli_npc.CLIP_AMMO_MAX = 8
 	self.ksg_npc = deep_clone(self.r870_npc)
+	self.ksg_npc.DAMAGE = 1.2
 
 	-- dozer guns
 	self.m249_npc.DAMAGE = 1
@@ -1749,6 +1750,7 @@ self.system.use_data.selection_index = SELECTION.UNDERBARREL_PRIMARY
 	self.shepheard_npc = deep_clone(self.mp5_npc)
 
 	-- misc guns
+	self.mossberg_npc.DAMAGE = 1
 	self.raging_bull_npc.DAMAGE = 1
 	self.ak47_ass_npc.DAMAGE = 1
 	self.ak47_ass_npc.auto.fire_rate = 0.2
@@ -1769,9 +1771,6 @@ self.system.use_data.selection_index = SELECTION.UNDERBARREL_PRIMARY
 	self.ksg_npc.sounds.prefix = "keltec_npc"
 	self.beretta92_npc.has_suppressor = "suppressed_b"
 	self.mossberg_npc.anim_usage = "is_shotgun_pump"
-	self.mossberg_npc.CLIP_AMMO_MAX = 2
-	self.mossberg_npc.shell_ejection = "effects/payday2/particles/weapons/shells/shell_empty"
-	self.mossberg_npc.sounds.prefix = self.huntsman_crew.sounds.prefix
 	self.mossberg_npc.usage = "is_double_barrel"
 	self.m14_sniper_npc.trail = "effects/particles/weapons/sniper_trail"
 	self.svd_snp_npc.trail = "effects/particles/weapons/sniper_trail"
diff --git a/supermod.xml b/supermod.xml
index 5f0c6add..c36deaa7 100644
--- a/supermod.xml
+++ b/supermod.xml
@@ -274,6 +274,11 @@
 		<!-- new weapons -->
 		<group name="units/payday2/weapons/">
 
+			<!-- huntsman retexture/model -->
+			<file :name="wpn_npc_sawnoff_shotgun/sawnoff_df.texture"/>
+			<file :name="wpn_npc_sawnoff_shotgun/sawnoff_nm.texture"/>
+			<file :name="wpn_npc_sawnoff_shotgun/wpn_npc_sawnoff_shotgun.model"/>
+
 			<!-- ksg -->
 			<file :name="wpn_npc_ksg/ksg_df.texture"/>
 			<file :name="wpn_npc_ksg/ksg_nm.texture"/>
@@ -294,7 +299,6 @@
 
 			<!-- ump & huntsman sound -->
 			<file :name="wpn_npc_ump/wpn_npc_ump.unit" dyn_package="false"/>
-			<file :name="wpn_npc_sawnoff_shotgun/wpn_npc_sawnoff_shotgun.unit" dyn_package="false"/>
 		</group>
 
 		<!-- zeals -->