diff --git a/loc/en.txt b/loc/en.txt
index 5b84989..ed9849f 100644
--- a/loc/en.txt
+++ b/loc/en.txt
@@ -56,7 +56,7 @@
 	"menu_shotgun_cqb_beta": "Fast Hands",
 	"menu_shotgun_cqb_beta_desc": "BASIC: ##$basic##\nYou reload ##Tube-fed## Shotguns ##$multibasic## faster.\n\nACE: ##$pro##\nYou reload ##Tube-fed## Shotguns an additional ##$multipro## faster.\nYou gain a ##$multipro2## increased steel sight zoom speed when using Shotguns.",
 	"menu_shotgun_impact_beta": "Point Blank",
-	"menu_shotgun_impact_beta_desc": "BASIC: ##$basic##\nShells for your Shotguns contain ##$multibasic## extra pellets.\n\nNote: Does not apply to AP or HE Slugs.\n\nACE: ##$pro##\nYour spread with Shotguns is increased by ##$multipro## when firing from the hip.",
+	"menu_shotgun_impact_beta_desc": "BASIC: ##$basic##\nYour Shotguns gain ##$multibasic## accuracy and stability.\n\nACE: ##$pro##\nShells for your Shotguns contain ##$multipro## extra pellets.\n\nNote: Does not apply to AP or HE Slugs.",
 	"menu_far_away_beta": "Shotgun CQB",
 	"menu_far_away_beta_desc": "BASIC: ##$basic##\nYour rate of fire is increased by ##$multibasic## while firing from the hip with single shot Shotguns.\n\nACE: ##$pro##\nFor every hit with a Shotgun you gain a ##$multipro## movement speed boost that lasts for ##$multipro2## seconds.\nStacks up to ##$multipro3## times.",
 	"menu_close_by_beta": "Mag-fed Specialist",
diff --git a/lua/skilltreetweakdata.lua b/lua/skilltreetweakdata.lua
index d6392b3..091848b 100644
--- a/lua/skilltreetweakdata.lua
+++ b/lua/skilltreetweakdata.lua
@@ -108,8 +108,8 @@ function SkillTreeTweakData:init(tweak_data)
 	self.skills.shotgun_cqb.icon_xy = { 5, 1 }
 
 	-- Point Blank
-	self.skills.shotgun_impact[1].upgrades = { "shotgun_extra_pellets" }
-	self.skills.shotgun_impact[2].upgrades = { "shotgun_hip_fire_spread_multiplier" }
+	self.skills.shotgun_impact[1].upgrades = { "shotgun_spread_index_addend", "shotgun_recoil_index_addend" }
+	self.skills.shotgun_impact[2].upgrades = { "shotgun_extra_pellets" }
 
 	-- Shotgun CQB
 	self.skills.far_away[1].upgrades = { "shotgun_hip_rate_of_fire_1" }
diff --git a/lua/upgradestweakdata.lua b/lua/upgradestweakdata.lua
index bada7ee..06b91cc 100644
--- a/lua/upgradestweakdata.lua
+++ b/lua/upgradestweakdata.lua
@@ -335,9 +335,10 @@ function UpgradesTweakData:init(tweak_data)
 	self.skill_descs.shotgun_cqb.multipro = "25%"
 
 	-- Point Blank
-	self.values.shotgun.extra_pellets = { 4 }
-	self.values.shotgun.hip_fire_spread_multiplier[1] = 1.25
-	self.definitions.shotgun_extra_pellets = {
+	self.values.shotgun.extra_pellets = { 2 }
+	self.values.shotgun.spread_index_addend = { 1 }
+	self.values.shotgun.recoil_index_addend[1] = 1
+ 	self.definitions.shotgun_extra_pellets = {
 		name_id = "menu_shotgun_extra_pellets",
 		category = "feature",
 		upgrade = {
@@ -346,8 +347,17 @@ function UpgradesTweakData:init(tweak_data)
 			category = "shotgun",
 		},
 	}
+	self.definitions.shotgun_spread_index_addend = {
+		name_id = "menu_shotgun_spread_index_addend",
+		category = "feature",
+		upgrade = {
+			value = 1,
+			upgrade = "spread_index_addend",
+			category = "shotgun"
+		}
+	}
 	self.skill_descs.shotgun_impact.multibasic = "4"
-	self.skill_descs.shotgun_impact.multipro = "25%"
+	self.skill_descs.shotgun_impact.multipro = "2"
 
 	-- Shotgun CQB
 	self.definitions.shotgun_speed_stack_on_kill = {
diff --git a/lua/weapontweakdata.lua b/lua/weapontweakdata.lua
index 7167a24..c81dd05 100644
--- a/lua/weapontweakdata.lua
+++ b/lua/weapontweakdata.lua
@@ -75,9 +75,9 @@ local pickup_tables = {
 	lmg_low = {4, 10},
 	minigun = {4, 8},
 
-	shot_very_high = {2, 3},
-	shot_high = {2, 2},
-	shot_mid = {1, 2},
+	shot_very_high = {1, 2.5},
+	shot_high = {1, 2},
+	shot_mid = {1, 1.5},
 	shot_low = {0.8, 1.4},
 	shot_very_low = {0.8, 1.25},
 	shot_special = {0.25, 0.45},
@@ -715,7 +715,7 @@ self.hailstorm.fire_mode_data.volley.ammo_usage = 120
 -- Izhma
 self.saiga.rays = 8
 self.saiga.stats.damage = 30
-self.saiga.stats.spread = 14
+self.saiga.stats.spread = 12
 self.saiga.AMMO_MAX = total_ammo_tables.shot_very_high
 self.saiga.AMMO_PICKUP = pickup_tables.shot_very_high
 self.saiga.kick = kick_tables.shot_auto
@@ -726,7 +726,7 @@ self.saiga.recoil_recovery_timer = recovery_tables.high
 -- Steakout
 self.aa12.rays = 8
 self.aa12.stats.damage = 30
-self.aa12.stats.spread = 14
+self.aa12.stats.spread = 12
 self.aa12.AMMO_MAX = total_ammo_tables.shot_very_high
 self.aa12.AMMO_PICKUP = pickup_tables.shot_very_high
 self.aa12.fire_mode_data.fire_rate = 60 / 333
@@ -738,11 +738,11 @@ self.aa12.recoil_recovery_timer = recovery_tables.high
 -- VD-12
 self.sko12.rays = 8
 self.sko12.stats.damage = 40
-self.sko12.stats.spread = 14
+self.sko12.stats.spread = 12
 self.sko12.stats.recoil = 8
 self.sko12.stats.reload = 9
 self.sko12.stats.concealment = 2
-self.sko12.CLIP_AMMO_MAX = 13
+self.sko12.CLIP_AMMO_MAX = 12
 self.sko12.AMMO_MAX = total_ammo_tables.shot_high
 self.sko12.AMMO_PICKUP = pickup_tables.shot_high
 self.sko12.FIRE_MODE = "single"
@@ -754,7 +754,7 @@ self.sko12.kick = kick_tables.shot_low
 -- M1014
 self.benelli.rays = 8
 self.benelli.stats.damage = 40
-self.benelli.stats.spread = 16
+self.benelli.stats.spread = 13
 self.benelli.AMMO_MAX = total_ammo_tables.shot_high
 self.benelli.AMMO_PICKUP = pickup_tables.shot_high
 self.benelli.fire_mode_data.fire_rate = 60 / 383
@@ -764,7 +764,7 @@ self.benelli.kick = kick_tables.shot_low
 -- Predator
 self.spas12.rays = 8
 self.spas12.stats.damage = 40
-self.spas12.stats.spread = 16
+self.spas12.stats.spread = 13
 self.spas12.AMMO_MAX = total_ammo_tables.shot_high
 self.spas12.AMMO_PICKUP = pickup_tables.shot_high
 self.spas12.fire_mode_data.fire_rate = 60 / 383
@@ -776,7 +776,7 @@ self.ksg.rays = 8
 self.ksg.stats.damage = 50
 self.ksg.stats.concealment = 20
 self.ksg.stats.reload = 12
-self.ksg.stats.spread = 16
+self.ksg.stats.spread = 14
 self.ksg.CLIP_AMMO_MAX = 8
 self.ksg.AMMO_MAX = total_ammo_tables.shot_mid
 self.ksg.AMMO_PICKUP = pickup_tables.shot_mid
@@ -787,7 +787,7 @@ self.ksg.damage_falloff = FALLOFF_TEMPLATE.SHOTGUN_FALL_MODERATE
 -- Nova
 self.supernova.rays = 8
 self.supernova.stats.damage = 50
-self.supernova.stats.spread = 16
+self.supernova.stats.spread = 14
 self.supernova.AMMO_MAX = total_ammo_tables.shot_mid
 self.supernova.AMMO_PICKUP = pickup_tables.shot_mid
 self.supernova.fire_mode_data.fire_rate = 0.6
@@ -797,7 +797,7 @@ self.supernova.kick = kick_tables.shot_low
 -- Reinfeld 880
 self.r870.rays = 8
 self.r870.stats.damage = 50
-self.r870.stats.spread = 16
+self.r870.stats.spread = 14
 self.r870.CLIP_AMMO_MAX = 8
 self.r870.AMMO_MAX = total_ammo_tables.shot_mid
 self.r870.AMMO_PICKUP = pickup_tables.shot_mid
@@ -809,7 +809,7 @@ self.r870.kick = kick_tables.shot_low
 self.m590.rays = 8
 self.m590.stats.reload = 11
 self.m590.stats.damage = 50
-self.m590.stats.spread = 16
+self.m590.stats.spread = 14
 self.m590.stats.concealment = 8
 self.m590.AMMO_MAX = total_ammo_tables.shot_mid
 self.m590.AMMO_PICKUP = pickup_tables.shot_mid
@@ -820,7 +820,7 @@ self.m590.kick = kick_tables.shot_low
 -- Breaker
 self.boot.rays = 8
 self.boot.stats.damage = 60
-self.boot.stats.spread = 17
+self.boot.stats.spread = 15
 self.boot.AMMO_MAX = total_ammo_tables.shot_low
 self.boot.AMMO_PICKUP = pickup_tables.shot_low
 self.boot.fire_mode_data.fire_rate = 0.8
@@ -830,7 +830,7 @@ self.boot.damage_falloff = FALLOFF_TEMPLATE.SHOTGUN_FALL_HIGH
 -- Reinfeld 88 (Trench Gun)
 self.m1897.rays = 8
 self.m1897.stats.damage = 60
-self.m1897.stats.spread = 17
+self.m1897.stats.spread = 15
 self.m1897.AMMO_MAX = total_ammo_tables.shot_low
 self.m1897.AMMO_PICKUP = pickup_tables.shot_low
 self.m1897.fire_mode_data.fire_rate = 0.8
@@ -841,7 +841,7 @@ self.m1897.kick = kick_tables.shot_high
 self.m37.use_data.selection_index = SELECTION.PRIMARY
 self.m37.rays = 8
 self.m37.stats.damage = 60
-self.m37.stats.spread = 17
+self.m37.stats.spread = 15
 self.m37.AMMO_MAX = total_ammo_tables.shot_low
 self.m37.AMMO_PICKUP = pickup_tables.shot_low
 self.m37.fire_mode_data.fire_rate = 0.8
@@ -860,7 +860,7 @@ self.huntsman.kick = kick_tables.shot_high
 -- Joceline
 self.b682.rays = 8
 self.b682.stats.damage = 80
-self.b682.stats.spread = 19
+self.b682.stats.spread = 17
 self.b682.AMMO_MAX = total_ammo_tables.shot_very_low
 self.b682.AMMO_PICKUP = pickup_tables.shot_very_low
 self.b682.kick = kick_tables.shot_high
@@ -869,7 +869,7 @@ self.b682.kick = kick_tables.shot_high
 -- Claire
 self.coach.rays = 8
 self.coach.stats.damage = 80
-self.coach.stats.spread = 19
+self.coach.stats.spread = 17
 self.coach.AMMO_MAX = total_ammo_tables.shot_very_low
 self.coach.AMMO_PICKUP = pickup_tables.shot_special
 self.coach.kick = kick_tables.shot_high
@@ -878,7 +878,7 @@ self.coach.kick = kick_tables.shot_high
 -- Judge
 self.judge.rays = 8
 self.judge.stats.damage = 50
-self.judge.stats.spread = 15
+self.judge.stats.spread = 13
 self.judge.AMMO_MAX = total_ammo_tables.shot_very_low
 self.judge.AMMO_PICKUP = pickup_tables.shot_very_low
 self.judge.AMMO_MAX = 25
@@ -890,7 +890,7 @@ self.serbu.AMMO_MAX = 24
 self.serbu.CLIP_AMMO_MAX = 4
 self.serbu.rays = 8
 self.serbu.stats.damage = 50
-self.serbu.stats.spread = 15
+self.serbu.stats.spread = 13
 self.serbu.AMMO_MAX = total_ammo_tables.shot_low
 self.serbu.AMMO_PICKUP = pickup_tables.shot_low
 self.serbu.fire_mode_data.fire_rate = 0.6
@@ -901,7 +901,7 @@ self.serbu.kick = kick_tables.shot_low
 self.rota.rays = 8
 self.rota.stats.damage = 40
 self.rota.stats.concealment = 20
-self.rota.stats.spread = 14
+self.rota.stats.spread = 12
 self.rota.AMMO_MAX = total_ammo_tables.shot_high
 self.rota.AMMO_PICKUP = pickup_tables.shot_high
 self.rota.kick = kick_tables.shot_low
@@ -911,7 +911,7 @@ self.rota.kick = kick_tables.shot_low
 self.striker.rays = 8
 self.striker.stats.damage = 40
 self.striker.stats.concealment = 24
-self.striker.stats.spread = 14
+self.striker.stats.spread = 12
 self.striker.AMMO_MAX = total_ammo_tables.shot_high
 self.striker.AMMO_PICKUP = pickup_tables.shot_high
 self.striker.kick = kick_tables.shot_low
@@ -920,7 +920,7 @@ self.striker.kick = kick_tables.shot_low
 -- Grimm
 self.basset.rays = 8
 self.basset.stats.damage = 30
-self.basset.stats.spread = 14
+self.basset.stats.spread = 12
 self.basset.AMMO_MAX = total_ammo_tables.shot_high
 self.basset.AMMO_PICKUP = pickup_tables.shot_very_high
 self.basset.kick = kick_tables.shot_auto
@@ -933,7 +933,7 @@ self.ultima.rays = 8
 self.ultima.stats.damage = 60
 self.ultima.stats.reload = 10
 self.ultima.stats.concealment = 17
-self.ultima.stats.spread = 16
+self.ultima.stats.spread = 14
 self.ultima.AMMO_MAX = total_ammo_tables.shot_very_low
 self.ultima.AMMO_PICKUP = pickup_tables.shot_very_low
 self.ultima.kick = kick_tables.shot_low
@@ -1698,8 +1698,7 @@ self.x_chinchilla.kick = kick_tables.revolver_low
 
 -- Judges
 self.x_judge.rays = 8
-self.x_judge.stats.damage = 115
-self.x_judge.stats_modifiers = {damage = 2}
+self.x_judge.stats.damage = 50
 self.x_judge.kick = kick_tables.shot_low
 self.x_judge.AMMO_MAX = total_ammo_tables.akimbo_special
 self.x_judge.AMMO_PICKUP = pickup_tables.shot_special