diff --git a/assets/database/db.bin b/assets/database/db.bin
index be27a9bda6..5b10957d96 100644
Binary files a/assets/database/db.bin and b/assets/database/db.bin differ
diff --git a/assets/database/db.json b/assets/database/db.json
index 2e1f5394a8..fc207d676b 100644
--- a/assets/database/db.json
+++ b/assets/database/db.json
@@ -9944,7 +9944,7 @@
 {"id":240152,"name":"Heretic Wristguards","icon":"inv_bracer_13","type":6,"armorType":1,"requiresLevel":60,"stats":[0,0,21,0,10,14,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,194,0,11,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":98,"phase":8,"quality":4,"sanctified":true,"setName":"Heretic Stitchings","setId":1953},
 {"id":240153,"name":"Heretic Boots","icon":"inv_boots_fabric_01","type":10,"armorType":1,"requiresLevel":60,"stats":[0,0,30,8,10,18,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,200,0,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":98,"phase":8,"quality":4,"sanctified":true,"setName":"Heretic Stitchings","setId":1953},
 {"id":240174,"name":"Solistra, Fang of the First Light","icon":"inv_misc_monsterfang_01","type":13,"weaponType":2,"handType":2,"requiresLevel":60,"stats":[0,12,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":70,"weaponDamageMax":131,"weaponSpeed":1.2,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4,"unique":true},
-{"id":240837,"name":"Strings of Fate","icon":"inv_weapon_bow_30","type":14,"rangedWeaponType":1,"requiresLevel":60,"stats":[0,10,8,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":159,"weaponDamageMax":297,"weaponSpeed":3.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
+{"id":240837,"name":"Strings of Fate","icon":"inv_weapon_bow_30","type":14,"rangedWeaponType":1,"requiresLevel":60,"stats":[0,21,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":177,"weaponDamageMax":330,"weaponSpeed":3.6,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
 {"id":240839,"name":"Thal'kituun, the Unseen Guest","icon":"inv_misc_monsterfang_01","type":13,"weaponType":2,"handType":1,"requiresLevel":60,"stats":[0,0,15,0,0,144,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,100,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":23,"weaponDamageMax":84,"weaponSpeed":1.3,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":92,"phase":8,"quality":4},
 {"id":240841,"name":"High Commander's Guard","icon":"inv_sword_74","type":13,"weaponType":9,"handType":1,"requiresLevel":60,"stats":[0,0,14,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":70,"weaponDamageMax":131,"weaponSpeed":1.2,"weaponSkills":[0,0,3,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4,"unique":true},
 {"id":240842,"name":"Scarlet Rotbringer","icon":"inv_staff_52","type":13,"weaponType":8,"handType":4,"requiresLevel":60,"stats":[20,14,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,150,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,700],"weaponDamageMin":159,"weaponDamageMax":235,"weaponSpeed":3.6,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":94,"phase":8,"quality":4},
@@ -9962,7 +9962,7 @@
 {"id":240922,"name":"Deception","icon":"inv_sword_2h_blood_c_01","type":13,"weaponType":9,"handType":2,"requiresLevel":60,"stats":[0,15,10,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":146,"weaponDamageMax":272,"weaponSpeed":2.7,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":92,"phase":8,"quality":4,"unique":true,"setName":"Tools of the Nathrezim","setId":1956},
 {"id":240923,"name":"Duplicity","icon":"inv_sword_2h_blood_c_01","type":13,"weaponType":9,"handType":2,"requiresLevel":60,"stats":[15,0,10,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":158,"weaponDamageMax":294,"weaponSpeed":2.8,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":94,"phase":8,"quality":4,"unique":true,"setName":"Tools of the Nathrezim","setId":1956},
 {"id":240924,"name":"Poleaxe of the Beast","icon":"inv_weapon_halberd_05","type":13,"weaponType":6,"handType":4,"requiresLevel":60,"stats":[0,40,13,0,0,0,0,0,0,0,0,0,0,1,3,0,0,0,1,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,756],"weaponDamageMin":296,"weaponDamageMax":444,"weaponSpeed":3.4,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
-{"id":240925,"name":"Experiment-800M","icon":"inv_weapon_rifle_19","type":14,"rangedWeaponType":3,"requiresLevel":60,"stats":[0,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":159,"weaponDamageMax":297,"weaponSpeed":3.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
+{"id":240925,"name":"Experiment-800M","icon":"inv_weapon_rifle_19","type":14,"rangedWeaponType":3,"requiresLevel":60,"stats":[0,10,10,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":159,"weaponDamageMax":297,"weaponSpeed":3.5,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
 {"id":240997,"name":"Fratley's Spur","icon":"ability_upgrademoonglaive","type":14,"rangedWeaponType":6,"requiresLevel":60,"stats":[6,6,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":152,"weaponDamageMax":283,"weaponSpeed":3,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":94,"phase":8,"quality":4},
 {"id":240998,"name":"Soporific Blade","icon":"inv_sword_05","type":13,"weaponType":2,"handType":1,"requiresLevel":60,"stats":[0,0,11,10,0,169,0,0,0,0,0,0,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":33,"weaponDamageMax":134,"weaponSpeed":2,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
 {"id":241001,"name":"Tyr's Fall","icon":"inv_mace_82","type":13,"weaponType":4,"handType":1,"requiresLevel":60,"stats":[0,0,9,17,0,169,0,0,0,0,0,0,0,0,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":39,"weaponDamageMax":160,"weaponSpeed":2.4,"weaponSkills":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":96,"phase":8,"quality":4},
diff --git a/assets/database/leftover_db.bin b/assets/database/leftover_db.bin
index db5378f4ef..cba0779e6f 100644
Binary files a/assets/database/leftover_db.bin and b/assets/database/leftover_db.bin differ
diff --git a/assets/database/leftover_db.json b/assets/database/leftover_db.json
index 3bdb93c14e..2d3dabceb8 100644
--- a/assets/database/leftover_db.json
+++ b/assets/database/leftover_db.json
@@ -1568,8 +1568,8 @@
 {"effectId":929,"itemId":16217,"spellId":20017,"name":"Enchant Shield - Greater Stamina","type":13,"enchantType":2,"stats":[0,0,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":930,"spellId":13947,"name":"Enchant Gloves - Riding Skill","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":931,"spellId":13948,"name":"Enchant Gloves - Minor Haste","type":7,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
-{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":943,"spellId":13693,"name":"Enchant Weapon - Striking","type":13,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
+{"effectId":943,"spellId":13529,"name":"Enchant 2H Weapon - Lesser Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":963,"spellId":13937,"name":"Enchant 2H Weapon - Greater Impact","type":13,"enchantType":1,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":1},
 {"effectId":1483,"itemId":11622,"spellId":15340,"name":"Lesser Arcanum of Rumination","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,150,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"quality":2},
 {"effectId":1503,"itemId":11642,"spellId":15389,"name":"Lesser Arcanum of Constitution","type":1,"extraTypes":[9],"enchantType":3,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0],"quality":2},
diff --git a/sim/common/sod/item_effects/phase_7.go b/sim/common/sod/item_effects/phase_7.go
index 357f64f12b..c59125569c 100644
--- a/sim/common/sod/item_effects/phase_7.go
+++ b/sim/common/sod/item_effects/phase_7.go
@@ -72,14 +72,14 @@ func init() {
 	})
 
 	// https://www.wowhead.com/classic/item=237512/blade-of-inquisition
-	// Equip: Chance on hit to Increase your Strength by 250 and movement speed by 15% for 15 sec. (15s cooldown)
+	// Equip: Chance on hit to Increase your Strength by 175 and movement speed by 15% for 15 sec. (15s cooldown)
 	// TODO: Verify proc chance, 1ppm for now
 	core.NewItemEffect(BladeOfInquisition, func(agent core.Agent) {
 		character := agent.GetCharacter()
 
 		dpm := character.AutoAttacks.NewDynamicProcManagerForWeaponEffect(BladeOfInquisition, 1.0, 0)
 
-		buffAura := character.NewTemporaryStatsAura("Scarlet Inquisition", core.ActionID{SpellID: 1223342}, stats.Stats{stats.Strength: 250}, time.Second*15)
+		buffAura := character.NewTemporaryStatsAura("Scarlet Inquisition", core.ActionID{SpellID: 1223342}, stats.Stats{stats.Strength: 175}, time.Second*15)
 
 		triggerAura := core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
 			Name:              "Blade of Inquisition Trigger",
diff --git a/sim/common/sod/item_effects/phase_8.go b/sim/common/sod/item_effects/phase_8.go
index f098c02fa7..43c2643fc5 100644
--- a/sim/common/sod/item_effects/phase_8.go
+++ b/sim/common/sod/item_effects/phase_8.go
@@ -267,29 +267,64 @@ func init() {
 	// https://www.wowhead.com/classic-ptr/item=240852/crimson-cleaver
 	// Chance on hit: Your next 2 instances of Nature damage are increased by 20%. Lasts 12 sec. (100ms cooldown)
 	// Confirmed PPM 1.0
-	itemhelpers.CreateWeaponProcAura(CrimsonCleaver, "Crimson Cleaver", 1.0, func(character *core.Character) *core.Aura {
-		duration := time.Second * 12
+	core.NewItemEffect(CrimsonCleaver, func(agent core.Agent) {
+		character := agent.GetCharacter()
+
+		procMask := core.ProcMaskMeleeSpecial | core.ProcMaskMeleeDamageProc | core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc
+
 		icd := core.Cooldown{
 			Timer:    character.NewTimer(),
 			Duration: time.Millisecond * 100,
 		}
 
-		// Confirmed on Wago - Harmful Spells and Melee Specials, plus Can proc from procs
-		procMask := core.ProcMaskMeleeSpecial | core.ProcMaskMeleeDamageProc | core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc
-
-		return character.RegisterAura(core.Aura{
+		buffAura := character.RegisterAura(core.Aura{
 			ActionID:  core.ActionID{SpellID: 1231456},
 			Label:     "Crimson Crusade",
-			Duration:  duration,
-			MaxStacks: 2,
+			Duration:  time.Second * 12,
+			MaxStacks: 4,
 			OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 				if spell.ProcMask.Matches(procMask) && spell.SpellSchool.Matches(core.SpellSchoolNature) && icd.IsReady(sim) {
-					icd.Use(sim)
 					aura.RemoveStack(sim)
 				}
 			},
 		}).AttachMultiplicativePseudoStatBuff(&character.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexNature], 1.20)
+
+		core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
+			Name:     "Crimson Cleaver Trigger",
+			Callback: core.CallbackOnSpellHitDealt,
+			Outcome:  core.OutcomeLanded,
+			ProcMask: core.ProcMaskMelee,
+			PPM:      1.0,
+			ICD:      time.Millisecond * 100,
+			Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+				buffAura.Activate(sim)
+				buffAura.SetStacks(sim, buffAura.MaxStacks)
+			},
+		})
 	})
+	// itemhelpers.CreateWeaponProcAura(CrimsonCleaver, "Crimson Cleaver", 1.0, func(character *core.Character) *core.Aura {
+	// 	duration := time.Second * 12
+	// 	icd := core.Cooldown{
+	// 		Timer:    character.NewTimer(),
+	// 		Duration: time.Millisecond * 100,
+	// 	}
+
+	// 	// Confirmed on Wago - Harmful Spells and Melee Specials, plus Can proc from procs
+	// 	procMask := core.ProcMaskMeleeSpecial | core.ProcMaskMeleeDamageProc | core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc
+
+	// 	return character.RegisterAura(core.Aura{
+	// 		ActionID:  core.ActionID{SpellID: 1231456},
+	// 		Label:     "Crimson Crusade",
+	// 		Duration:  duration,
+	// 		MaxStacks: 2,
+	// 		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+	// 			if spell.ProcMask.Matches(procMask) && spell.SpellSchool.Matches(core.SpellSchoolNature) && icd.IsReady(sim) {
+	// 				icd.Use(sim)
+	// 				aura.RemoveStack(sim)
+	// 			}
+	// 		},
+	// 	}).AttachMultiplicativePseudoStatBuff(&character.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexNature], 1.20)
+	// })
 
 	// https://www.wowhead.com/classic-ptr/item=240922/deception
 	// Equip: 2% chance on melee hit to gain 1 extra attack. (Proc chance: 2%, 100ms cooldown)
@@ -352,7 +387,7 @@ func init() {
 			SpellSchool: core.SpellSchoolFire,
 			DefenseType: core.DefenseTypeMagic,
 			ProcMask:    core.ProcMaskSpellDamage,
-			Flags:       core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell,
+			Flags:       core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell | core.SpellFlagIgnoreAttackerModifiers | core.SpellFlagIgnoreTargetModifiers,
 
 			DamageMultiplier: 1,
 			ThreatMultiplier: 1,
@@ -622,31 +657,66 @@ func init() {
 	})
 
 	// https://www.wowhead.com/classic-ptr/item=240854/mercy
-	// Chance on hit: Your next 2 instances of Fire damage are increased by 20%.  Lasts 12 sec. (100ms cooldown)
+	// Chance on hit: Your next 4 instances of Fire damage are increased by 20%.  Lasts 12 sec. (100ms cooldown)
 	// Confirmed PPM 1.0
-	itemhelpers.CreateWeaponProcAura(Mercy, "Mercy", 1.0, func(character *core.Character) *core.Aura {
-		duration := time.Second * 12
+	core.NewItemEffect(Mercy, func(agent core.Agent) {
+		character := agent.GetCharacter()
+
+		procMask := core.ProcMaskMeleeSpecial | core.ProcMaskMeleeDamageProc | core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc
+
 		icd := core.Cooldown{
 			Timer:    character.NewTimer(),
 			Duration: time.Millisecond * 100,
 		}
 
-		// Confirmed on Wago - Harmful Spells and Melee Specials, plus Can proc from procs
-		procMask := core.ProcMaskMeleeSpecial | core.ProcMaskMeleeDamageProc | core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc
-
-		return character.RegisterAura(core.Aura{
+		buffAura := character.RegisterAura(core.Aura{
 			ActionID:  core.ActionID{SpellID: 1231498},
 			Label:     "Mercy by Fire",
-			Duration:  duration,
-			MaxStacks: 2,
+			Duration:  time.Second * 12,
+			MaxStacks: 4,
 			OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 				if spell.ProcMask.Matches(procMask) && spell.SpellSchool.Matches(core.SpellSchoolFire) && icd.IsReady(sim) {
-					icd.Use(sim)
 					aura.RemoveStack(sim)
 				}
 			},
 		}).AttachMultiplicativePseudoStatBuff(&character.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexFire], 1.20)
+
+		core.MakeProcTriggerAura(&character.Unit, core.ProcTrigger{
+			Name:     "Mercy Trigger",
+			Callback: core.CallbackOnSpellHitDealt,
+			Outcome:  core.OutcomeLanded,
+			ProcMask: core.ProcMaskMelee,
+			PPM:      1.0,
+			ICD:      time.Millisecond * 100,
+			Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+				buffAura.Activate(sim)
+				buffAura.SetStacks(sim, buffAura.MaxStacks)
+			},
+		})
 	})
+	// itemhelpers.CreateWeaponProcAura(Mercy, "Mercy", 1.0, func(character *core.Character) *core.Aura {
+	// 	duration := time.Second * 12
+	// 	icd := core.Cooldown{
+	// 		Timer:    character.NewTimer(),
+	// 		Duration: time.Millisecond * 100,
+	// 	}
+
+	// 	// Confirmed on Wago - Harmful Spells and Melee Specials, plus Can proc from procs
+	// 	procMask := core.ProcMaskMeleeSpecial | core.ProcMaskMeleeDamageProc | core.ProcMaskSpellDamage | core.ProcMaskSpellDamageProc
+
+	// 	return character.RegisterAura(core.Aura{
+	// 		ActionID:  core.ActionID{SpellID: 1231498},
+	// 		Label:     "Mercy by Fire",
+	// 		Duration:  duration,
+	// 		MaxStacks: 2,
+	// 		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+	// 			if spell.ProcMask.Matches(procMask) && spell.SpellSchool.Matches(core.SpellSchoolFire) && icd.IsReady(sim) {
+	// 				icd.Use(sim)
+	// 				aura.RemoveStack(sim)
+	// 			}
+	// 		},
+	// 	}).AttachMultiplicativePseudoStatBuff(&character.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexFire], 1.20)
+	// })
 
 	// https://www.wowhead.com/classic-ptr/item=241003/mirage-rod-of-illusion
 	// Equip: Chance on landing a damaging spell to create a Mirage on top of your target that deals arcane damage to nearby enemies for 30 sec. (Proc chance: 10%, 30s cooldown)
@@ -684,7 +754,7 @@ func init() {
 					Label: "Mirage",
 				},
 				NumberOfTicks: 10,
-				TickLength:    time.Second * 3,
+				TickLength:    core.GCDDefault,
 				OnTick: func(sim *core.Simulation, target *core.Unit, dot *core.Dot) {
 					explosionSpell.Cast(sim, target)
 				},
diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results
index fa06ea92dd..8d56ebd6ce 100644
--- a/sim/druid/feral/TestFeral.results
+++ b/sim/druid/feral/TestFeral.results
@@ -442,8 +442,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestFeral-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.92376
-  weights: 2.83273
+  weights: 2.88439
+  weights: 2.94341
   weights: 0
   weights: 0
   weights: 0
@@ -459,9 +459,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.96303
+  weights: 0.95007
   weights: 0
-  weights: 24.03764
+  weights: 24.16015
   weights: 0
   weights: 0
   weights: 0
@@ -1784,9 +1784,9 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-CoagulateBloodguard'sLeathers"
  value: {
-  dps: 2402.4889
-  tps: 1723.52842
-  hps: 53.33433
+  dps: 2370.65998
+  tps: 1700.95959
+  hps: 53.18183
  }
 }
 dps_results: {
@@ -1816,9 +1816,9 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-ExiledProphet'sRaiment"
  value: {
-  dps: 2244.92449
-  tps: 1618.93843
-  hps: 52.47017
+  dps: 2225.97511
+  tps: 1606.17346
+  hps: 52.5515
  }
 }
 dps_results: {
@@ -1856,294 +1856,294 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-LostWorshipper'sArmor"
  value: {
-  dps: 2287.74954
-  tps: 1650.08849
-  hps: 53.01917
+  dps: 2259.89815
+  tps: 1630.2727
+  hps: 52.92767
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 5135.94578
-  tps: 3669.36446
-  hps: 60.9827
+  dps: 5068.26327
+  tps: 3621.31011
+  hps: 60.97094
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5201.37838
-  tps: 4148.78311
-  hps: 61.3355
+  dps: 5175.55597
+  tps: 4129.47036
+  hps: 61.38633
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 5112.17374
-  tps: 3652.43358
-  hps: 61.3355
+  dps: 5086.54469
+  tps: 3634.18801
+  hps: 61.38633
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5515.29021
-  tps: 3931.96451
-  hps: 66.74417
+  dps: 5446.30845
+  tps: 3883.16141
+  hps: 66.59167
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2160.08932
-  tps: 1686.7148
+  dps: 2126.48917
+  tps: 1661.48867
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2111.08459
-  tps: 1508.44037
+  dps: 2076.82996
+  tps: 1483.79593
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2517.68197
-  tps: 1794.74118
+  dps: 2487.22903
+  tps: 1773.11959
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5201.37838
-  tps: 4148.78311
-  hps: 61.3355
+  dps: 5175.55597
+  tps: 4129.47036
+  hps: 61.38633
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 5112.17374
-  tps: 3652.43358
-  hps: 61.3355
+  dps: 5086.54469
+  tps: 3634.18801
+  hps: 61.38633
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5515.29021
-  tps: 3931.96451
-  hps: 66.74417
+  dps: 5446.30845
+  tps: 3883.16141
+  hps: 66.59167
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2160.08932
-  tps: 1686.7148
+  dps: 2126.48917
+  tps: 1661.48867
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2111.08459
-  tps: 1508.44037
+  dps: 2076.82996
+  tps: 1483.79593
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2517.68197
-  tps: 1794.74118
+  dps: 2487.22903
+  tps: 1773.11959
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5201.37838
-  tps: 4148.78311
-  hps: 61.3355
+  dps: 5175.55597
+  tps: 4129.47036
+  hps: 61.38633
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 5112.17374
-  tps: 3652.43358
-  hps: 61.3355
+  dps: 5086.54469
+  tps: 3634.18801
+  hps: 61.38633
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5515.29021
-  tps: 3931.96451
-  hps: 66.74417
+  dps: 5446.30845
+  tps: 3883.16141
+  hps: 66.59167
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2160.08932
-  tps: 1686.7148
+  dps: 2126.48917
+  tps: 1661.48867
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2111.08459
-  tps: 1508.44037
+  dps: 2076.82996
+  tps: 1483.79593
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2517.68197
-  tps: 1794.74118
+  dps: 2487.22903
+  tps: 1773.11959
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5192.36294
-  tps: 4144.36676
-  hps: 61.3355
+  dps: 5168.52624
+  tps: 4126.77908
+  hps: 61.427
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 5103.25991
-  tps: 3646.20399
-  hps: 61.3355
+  dps: 5079.33156
+  tps: 3629.18168
+  hps: 61.427
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5508.10692
-  tps: 3927.19721
-  hps: 66.74417
+  dps: 5440.92526
+  tps: 3879.40447
+  hps: 66.59167
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2141.70939
-  tps: 1668.58854
+  dps: 2117.96958
+  tps: 1656.09478
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2092.56917
-  tps: 1495.05631
+  dps: 2068.45184
+  tps: 1477.87399
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2517.94212
-  tps: 1794.92589
+  dps: 2485.70152
+  tps: 1772.03506
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5192.36294
-  tps: 4144.36676
-  hps: 61.3355
+  dps: 5168.52624
+  tps: 4126.77908
+  hps: 61.427
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 5103.25991
-  tps: 3646.20399
-  hps: 61.3355
+  dps: 5079.33156
+  tps: 3629.18168
+  hps: 61.427
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5508.10692
-  tps: 3927.19721
-  hps: 66.74417
+  dps: 5440.92526
+  tps: 3879.40447
+  hps: 66.59167
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2141.70939
-  tps: 1668.58854
+  dps: 2117.96958
+  tps: 1656.09478
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2092.56917
-  tps: 1495.05631
+  dps: 2068.45184
+  tps: 1477.87399
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2517.94212
-  tps: 1794.92589
+  dps: 2485.70152
+  tps: 1772.03506
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5192.36294
-  tps: 4144.36676
-  hps: 61.3355
+  dps: 5168.52624
+  tps: 4126.77908
+  hps: 61.427
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 5103.25991
-  tps: 3646.20399
-  hps: 61.3355
+  dps: 5079.33156
+  tps: 3629.18168
+  hps: 61.427
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5508.10692
-  tps: 3927.19721
-  hps: 66.74417
+  dps: 5440.92526
+  tps: 3879.40447
+  hps: 66.59167
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2141.70939
-  tps: 1668.58854
+  dps: 2117.96958
+  tps: 1656.09478
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2092.56917
-  tps: 1495.05631
+  dps: 2068.45184
+  tps: 1477.87399
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2517.94212
-  tps: 1794.92589
+  dps: 2485.70152
+  tps: 1772.03506
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3482.26819
-  tps: 2483.06825
-  hps: 50.73167
+  dps: 3437.75084
+  tps: 2451.7871
+  hps: 50.80283
  }
 }
diff --git a/sim/druid/item_sets_pve_phase_5.go b/sim/druid/item_sets_pve_phase_5.go
index a5505216c0..b8359df85f 100644
--- a/sim/druid/item_sets_pve_phase_5.go
+++ b/sim/druid/item_sets_pve_phase_5.go
@@ -121,7 +121,7 @@ var ItemSetCunningOfStormrage = core.NewItemSet(core.ItemSet{
 	},
 })
 
-// Increases the duration of Rake by 6 sec and its periodic damage by 10%.
+// Increases the duration of Rake by 3 sec and its periodic damage by 10%.
 func (druid *Druid) applyT2Feral2PBonus() {
 	label := "S03 - Item - T2 - Druid - Feral 2P Bonus"
 	if druid.HasAura(label) {
@@ -137,7 +137,7 @@ func (druid *Druid) applyT2Feral2PBonus() {
 					continue
 				}
 
-				dot.NumberOfTicks += int32(6 / dot.TickLength.Seconds())
+				dot.NumberOfTicks += int32(3 / dot.TickLength.Seconds())
 				dot.RecomputeAuraDuration()
 			}
 		},
diff --git a/sim/druid/item_sets_pve_phase_6.go b/sim/druid/item_sets_pve_phase_6.go
index d70c018756..b7e0c01434 100644
--- a/sim/druid/item_sets_pve_phase_6.go
+++ b/sim/druid/item_sets_pve_phase_6.go
@@ -78,20 +78,19 @@ func (druid *Druid) applyTAQFeral2PBonus() {
 		return
 	}
 
-	damageMod := druid.AddDynamicMod(core.SpellModConfig{
-		Kind:      core.SpellMod_DamageDone_Flat,
-		ClassMask: ClassSpellMask_DruidShred,
-		IntValue:  15,
-	})
+	if !druid.PseudoStats.InFrontOfTarget {
+		druid.AddStaticMod(core.SpellModConfig{
+			Kind:       core.SpellMod_DamageDone_Pct,
+			ClassMask:  ClassSpellMask_DruidShred,
+			FloatValue: 1.05,
+		})
+	}
 
 	druid.RegisterAura(core.Aura{
 		ActionID: core.ActionID{SpellID: 1213171}, // Tracking in APL
 		Label:    label,
 		OnInit: func(aura *core.Aura, sim *core.Simulation) {
 			druid.ShredPositionOverride = true
-			if !druid.PseudoStats.InFrontOfTarget {
-				damageMod.Activate()
-			}
 		},
 	})
 }
diff --git a/sim/druid/item_sets_pve_phase_8.go b/sim/druid/item_sets_pve_phase_8.go
index 302e4df5eb..d50c27b41d 100644
--- a/sim/druid/item_sets_pve_phase_8.go
+++ b/sim/druid/item_sets_pve_phase_8.go
@@ -26,7 +26,7 @@ var ItemSetWaywatcherEclipse = core.NewItemSet(core.ItemSet{
 	},
 })
 
-// Your Starfire deals 20% more damage to targets with your Moonfire, and your Wrath deals 20% more damage to targets with your Sunfire.
+// Your Starfire deals 20% more damage to targets with your Moonfire, and your Wrath deals 40% more damage to targets with your Sunfire.
 func (druid *Druid) applyScarletEnclaveBalance2PBonus() {
 	label := "S03 - Item - Scarlet Enclave - Druid - Balance 2P Bonus"
 	if druid.HasAura(label) {
@@ -62,7 +62,7 @@ func (druid *Druid) applyScarletEnclaveBalance2PBonus() {
 				wrathDamageMod.UpdateFloatValue(1)
 				if druid.Sunfire.Dot(target).IsActive() {
 					wrathDamageMod.Activate()
-					wrathDamageMod.UpdateFloatValue(1.20)
+					wrathDamageMod.UpdateFloatValue(1.40)
 				}
 			}
 		},
@@ -88,7 +88,7 @@ func (druid *Druid) applyScarletEnclaveBalance4PBonus() {
 	}))
 }
 
-// Each time your Sunfire deals periodic damage, you gain 20% increased damage to your next Wrath, stacking up to 5 times.
+// Each time your Sunfire deals periodic damage, you gain 40% increased damage to your next Wrath, stacking up to 5 times.
 // Each time your Moonfire deals periodic damage, you gain 20% increased damage to your next Stafire, stacking up to 5 times.
 // These bonuses do not apply to Starsurge.
 func (druid *Druid) applyScarletEnclaveBalance6PBonus() {
@@ -114,7 +114,7 @@ func (druid *Druid) applyScarletEnclaveBalance6PBonus() {
 			wrathDamageMod.Deactivate()
 		},
 		OnStacksChange: func(aura *core.Aura, sim *core.Simulation, oldStacks, newStacks int32) {
-			wrathDamageMod.UpdateIntValue(20 * int64(newStacks))
+			wrathDamageMod.UpdateIntValue(40 * int64(newStacks))
 		},
 	})
 
diff --git a/sim/druid/items.go b/sim/druid/items.go
index 2f3044f63b..45343a3989 100644
--- a/sim/druid/items.go
+++ b/sim/druid/items.go
@@ -463,11 +463,17 @@ func init() {
 	})
 
 	// https://www.wowhead.com/classic-ptr/item=240849/staff-of-the-glade
-	// Equip: Remaining in Cat Form for 5 seconds, causes your Energy Regeneration to increase by 100%, and the damage of your Ferocious Bite to increase by 100%.
+	// Equip: Remaining in Cat Form for 5 seconds, causes your Energy Regeneration to increase by 40%, and the damage of your Ferocious Bite to increase by 25%.
 	// Equip: You may cast Rebirth and Innervate while in Cat Form.
 	core.NewItemEffect(StaffOfTheGlade, func(agent core.Agent) {
 		druid := agent.(DruidAgent).GetDruid()
 
+		druid.AddStaticMod(core.SpellModConfig{
+			ClassMask:  ClassSpellMask_DruidFerociousBite,
+			Kind:       core.SpellMod_DamageDone_Pct,
+			FloatValue: 1.25,
+		})
+
 		// https://www.wowhead.com/classic-ptr/spell=1231381/feral-dedication
 		auraBuff := druid.RegisterAura(core.Aura{
 			ActionID: core.ActionID{
@@ -475,18 +481,14 @@ func init() {
 			},
 			Duration: core.NeverExpires,
 			Label:    "Feral Dedication",
-		}).AttachSpellMod(core.SpellModConfig{
-			ClassMask:  ClassSpellMask_DruidFerociousBite,
-			Kind:       core.SpellMod_DamageDone_Pct,
-			FloatValue: 2.0,
 		}).AttachSpellMod(core.SpellModConfig{
 			ClassMask: ClassSpellMask_DruidFerociousBite,
 			Kind:      core.SpellMod_Custom,
 			ApplyCustom: func(mod *core.SpellMod, spell *core.Spell) {
-				druid.EnergyTickMultiplier *= 1.5
+				druid.EnergyTickMultiplier *= 1.40
 			},
 			RemoveCustom: func(mod *core.SpellMod, spell *core.Spell) {
-				druid.EnergyTickMultiplier /= 1.5
+				druid.EnergyTickMultiplier /= 1.40
 			},
 		})
 
diff --git a/sim/hunter/dps_hunter/TestBM.results b/sim/hunter/dps_hunter/TestBM.results
index 2b38093cd3..894fe07afd 100644
--- a/sim/hunter/dps_hunter/TestBM.results
+++ b/sim/hunter/dps_hunter/TestBM.results
@@ -149,7 +149,7 @@ stat_weights_results: {
  key: "TestBM-Phase2-Lvl40-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.92594
+  weights: 0.94217
   weights: 0
   weights: 0
   weights: 0
@@ -165,9 +165,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.35149
-  weights: 9.70067
-  weights: 8.06229
+  weights: 0.36341
+  weights: 9.11387
+  weights: 8.46127
   weights: 0
   weights: 0
   weights: 0
@@ -175,7 +175,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.07056
+  weights: 0.07055
   weights: 0
   weights: 0
   weights: 0
@@ -310,107 +310,107 @@ dps_results: {
 dps_results: {
  key: "TestBM-Phase2-Lvl40-AllItems-SignetofBeasts-209823"
  value: {
-  dps: 858.06441
-  tps: 367.30335
-  hps: 27.82333
+  dps: 872.46626
+  tps: 362.91312
+  hps: 27.94233
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Average-Default"
  value: {
-  dps: 863.07713
-  tps: 368.45744
-  hps: 27.27326
+  dps: 880.70228
+  tps: 363.96988
+  hps: 27.53101
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 2241.15389
-  tps: 2031.23949
-  hps: 28.72433
+  dps: 2205.91768
+  tps: 1977.15983
+  hps: 28.36733
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 880.19299
-  tps: 382.53479
-  hps: 27.82333
+  dps: 901.165
+  tps: 380.3113
+  hps: 27.86867
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 934.84417
-  tps: 391.18513
-  hps: 28.10667
+  dps: 944.12012
+  tps: 386.74932
+  hps: 28.27667
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 1257.30685
-  tps: 1269.02205
+  dps: 1229.44744
+  tps: 1231.96961
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 449.83688
-  tps: 200.57441
+  dps: 460.32093
+  tps: 198.99289
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 490.53762
-  tps: 204.65895
+  dps: 502.0518
+  tps: 201.89278
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 876.17947
-  tps: 579.24532
-  hps: 19.66333
+  dps: 904.66499
+  tps: 594.3605
+  hps: 20.60967
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 788.09735
-  tps: 292.28296
-  hps: 19.66333
+  dps: 814.93007
+  tps: 293.06158
+  hps: 20.60967
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 830.65055
-  tps: 295.1507
-  hps: 19.69167
+  dps: 852.1907
+  tps: 294.19697
+  hps: 20.42833
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 457.79128
-  tps: 420.75657
+  dps: 472.8091
+  tps: 431.20116
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 412.36542
-  tps: 159.8211
+  dps: 425.88402
+  tps: 160.59666
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 443.52319
-  tps: 155.81512
+  dps: 456.4014
+  tps: 161.10999
  }
 }
 dps_results: {
@@ -506,91 +506,91 @@ dps_results: {
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 2165.14686
-  tps: 1960.74682
-  hps: 27.73267
+  dps: 2132.37452
+  tps: 1910.09994
+  hps: 28.05
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 869.30152
-  tps: 372.41931
-  hps: 27.88567
+  dps: 884.4333
+  tps: 368.56993
+  hps: 27.94233
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 905.24961
-  tps: 369.63532
-  hps: 27.73833
+  dps: 926.79176
+  tps: 372.36187
+  hps: 27.71
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 1242.55408
-  tps: 1247.97713
+  dps: 1221.94127
+  tps: 1210.09745
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 452.40543
-  tps: 197.50867
+  dps: 462.55162
+  tps: 196.11057
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 496.02608
-  tps: 206.60368
+  dps: 504.71453
+  tps: 201.93512
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 864.40682
-  tps: 574.04875
-  hps: 19.69167
+  dps: 893.75752
+  tps: 590.24246
+  hps: 20.59267
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 776.70578
-  tps: 281.85253
-  hps: 19.69167
+  dps: 804.023
+  tps: 283.45853
+  hps: 20.59267
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 821.0496
-  tps: 285.61326
-  hps: 19.69167
+  dps: 841.9163
+  tps: 284.93044
+  hps: 20.42833
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 460.55428
-  tps: 418.12049
+  dps: 471.83268
+  tps: 426.92158
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 414.92114
-  tps: 159.27622
+  dps: 425.64425
+  tps: 157.66188
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_ranged_bm-NoBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 448.15684
-  tps: 156.85471
+  dps: 460.47917
+  tps: 162.07585
  }
 }
 dps_results: {
@@ -686,8 +686,8 @@ dps_results: {
 dps_results: {
  key: "TestBM-Phase2-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 819.93314
-  tps: 337.17385
-  hps: 25.45467
+  dps: 840.24211
+  tps: 337.14185
+  hps: 26.163
  }
 }
diff --git a/sim/hunter/dps_hunter/TestSV.results b/sim/hunter/dps_hunter/TestSV.results
index 943a57f999..0ef059cbc7 100644
--- a/sim/hunter/dps_hunter/TestSV.results
+++ b/sim/hunter/dps_hunter/TestSV.results
@@ -247,7 +247,7 @@ stat_weights_results: {
  key: "TestSV-Phase2-Lvl40-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.9205
+  weights: 0.95306
   weights: 0
   weights: 0
   weights: 0
@@ -263,9 +263,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.38574
-  weights: 4.47102
-  weights: 7.45065
+  weights: 0.40014
+  weights: 5.48714
+  weights: 7.51515
   weights: 0
   weights: 0
   weights: 0
@@ -273,7 +273,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.04042
+  weights: 0.04049
   weights: 0
   weights: 0
   weights: 0
@@ -506,115 +506,115 @@ dps_results: {
 dps_results: {
  key: "TestSV-Phase2-Lvl40-AllItems-SignetofBeasts-209823"
  value: {
-  dps: 809.67421
-  tps: 399.80801
-  hps: 28.51467
+  dps: 830.78159
+  tps: 395.80573
+  hps: 28.70167
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Average-Default"
  value: {
-  dps: 816.02437
-  tps: 405.09964
-  hps: 28.32732
+  dps: 839.97725
+  tps: 400.04032
+  hps: 28.59261
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 2308.31244
-  tps: 2177.85278
-  hps: 29.08133
+  dps: 2271.31367
+  tps: 2107.71302
+  hps: 29.54033
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 830.24212
-  tps: 419.57819
-  hps: 28.458
+  dps: 856.09896
+  tps: 412.0038
+  hps: 29.12667
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 865.80213
-  tps: 431.99302
+  dps: 882.47606
+  tps: 416.29793
   hps: 28.95667
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 1304.63328
-  tps: 1338.83284
+  dps: 1296.78114
+  tps: 1321.06532
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 437.21687
-  tps: 220.93806
+  dps: 451.79405
+  tps: 218.96725
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 475.76797
-  tps: 233.45788
+  dps: 488.72836
+  tps: 228.93987
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 2243.9365
-  tps: 2117.71131
-  hps: 28.92833
+  dps: 2210.96498
+  tps: 2055.83994
+  hps: 29.27967
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 822.36381
-  tps: 406.68573
-  hps: 28.51467
+  dps: 843.80655
+  tps: 402.87095
+  hps: 28.70167
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 855.36375
-  tps: 429.68785
-  hps: 29.18333
+  dps: 874.03313
+  tps: 416.74428
+  hps: 29.155
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 1318.7201
-  tps: 1345.97703
+  dps: 1293.98328
+  tps: 1310.21428
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 439.18107
-  tps: 219.19297
+  dps: 453.79902
+  tps: 217.28941
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-NoBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 472.29137
-  tps: 225.97375
+  dps: 492.15224
+  tps: 226.10107
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 772.6792
-  tps: 377.52584
-  hps: 26.724
+  dps: 790.21707
+  tps: 370.00179
+  hps: 26.75233
  }
 }
 dps_results: {
diff --git a/sim/hunter/hunter.go b/sim/hunter/hunter.go
index 16bb01ce75..21a825d169 100644
--- a/sim/hunter/hunter.go
+++ b/sim/hunter/hunter.go
@@ -284,9 +284,9 @@ func NewHunter(character *core.Character, options *proto.Player) *Hunter {
 		case proto.Hunter_Options_MiniatureCannonBalls:
 			hunter.AmmoDPS = 20.5
 		case proto.Hunter_Options_SearingArrow:
-			hunter.AmmoDPS = 25
+			hunter.AmmoDPS = 30
 		case proto.Hunter_Options_SearingShot:
-			hunter.AmmoDPS = 25
+			hunter.AmmoDPS = 30
 		}
 		hunter.AmmoDamageBonus = hunter.AmmoDPS * rangedWeapon.SwingSpeed
 		hunter.NormalizedAmmoDamageBonus = hunter.AmmoDPS * 2.8
diff --git a/sim/hunter/item_sets_pve_phase_6.go b/sim/hunter/item_sets_pve_phase_6.go
index 0490efb6fa..86da2de036 100644
--- a/sim/hunter/item_sets_pve_phase_6.go
+++ b/sim/hunter/item_sets_pve_phase_6.go
@@ -105,7 +105,7 @@ func (hunter *Hunter) applyTAQRanged2PBonus() {
 	}).AttachSpellMod(core.SpellModConfig{
 		Kind:      core.SpellMod_DamageDone_Flat,
 		ClassMask: ClassSpellMask_HunterKillShot,
-		IntValue:  30,
+		IntValue:  10,
 	}))
 }
 
diff --git a/sim/hunter/item_sets_pve_phase_7.go b/sim/hunter/item_sets_pve_phase_7.go
index fea40a5ace..1efe683582 100644
--- a/sim/hunter/item_sets_pve_phase_7.go
+++ b/sim/hunter/item_sets_pve_phase_7.go
@@ -147,7 +147,7 @@ var ItemSetCryptstalkerArmor = core.NewItemSet(core.ItemSet{
 	},
 })
 
-// Your Serpent Sting deals 20% more damage.
+// Reduces the cooldown on your Chimera Shot, Explosive Shot, and Aimed Shot abilities by 1.5 sec and reduces the cooldown on your Kill Shot ability by 3sec and Multishot by 4sec.
 func (hunter *Hunter) applyNaxxramasRanged2PBonus() {
 	label := "S03 - Item - Naxxramas - Hunter - Ranged 2P Bonus"
 	if hunter.HasAura(label) {
@@ -156,14 +156,22 @@ func (hunter *Hunter) applyNaxxramasRanged2PBonus() {
 
 	core.MakePermanent(hunter.RegisterAura(core.Aura{
 		Label: label,
+	})).AttachSpellMod(core.SpellModConfig{
+		ClassMask: ClassSpellMask_HunterChimeraShot | ClassSpellMask_HunterExplosiveShot | ClassSpellMask_HunterAimedShot,
+		Kind:      core.SpellMod_Cooldown_Flat,
+		TimeValue: -time.Millisecond * 1500,
 	}).AttachSpellMod(core.SpellModConfig{
-		Kind:      core.SpellMod_DamageDone_Flat,
-		ClassMask: ClassSpellMask_HunterSerpentSting | ClassSpellMask_HunterSoFSerpentSting | ClassSpellMask_HunterChimeraSerpent,
-		IntValue:  20,
-	}))
+		ClassMask: ClassSpellMask_HunterKillShot,
+		Kind:      core.SpellMod_Cooldown_Flat,
+		TimeValue: -time.Second * 3,
+	}).AttachSpellMod(core.SpellModConfig{
+		ClassMask: ClassSpellMask_HunterMultiShot,
+		Kind:      core.SpellMod_Cooldown_Flat,
+		TimeValue: -time.Second * 4,
+	})
 }
 
-// Reduces the cooldown on your Chimera Shot, Explosive Shot, and Aimed Shot abilities by 1.5 sec and reduces the cooldown on your Kill Shot ability by 3sec.
+// Your Serpent Sting deals 20% more damage.
 func (hunter *Hunter) applyNaxxramasRanged4PBonus() {
 	label := "S03 - Item - Naxxramas - Hunter - Ranged 4P Bonus"
 	if hunter.HasAura(label) {
@@ -172,15 +180,11 @@ func (hunter *Hunter) applyNaxxramasRanged4PBonus() {
 
 	core.MakePermanent(hunter.RegisterAura(core.Aura{
 		Label: label,
-	})).AttachSpellMod(core.SpellModConfig{
-		ClassMask: ClassSpellMask_HunterChimeraShot | ClassSpellMask_HunterExplosiveShot | ClassSpellMask_HunterAimedShot,
-		Kind:      core.SpellMod_Cooldown_Flat,
-		TimeValue: -time.Millisecond * 1500,
 	}).AttachSpellMod(core.SpellModConfig{
-		ClassMask: ClassSpellMask_HunterKillShot,
-		Kind:      core.SpellMod_Cooldown_Flat,
-		TimeValue: -time.Second * 3,
-	})
+		Kind:      core.SpellMod_DamageDone_Flat,
+		ClassMask: ClassSpellMask_HunterSerpentSting | ClassSpellMask_HunterSoFSerpentSting | ClassSpellMask_HunterChimeraSerpent,
+		IntValue:  20,
+	}))
 }
 
 // You gain 2% increased damage and critical damage done to Undead for 30 sec each time you hit an Undead enemy with a ranged attack, stacking up to 7 times.
diff --git a/sim/hunter/item_sets_pve_phase_8.go b/sim/hunter/item_sets_pve_phase_8.go
index 7006a11280..86945afd70 100644
--- a/sim/hunter/item_sets_pve_phase_8.go
+++ b/sim/hunter/item_sets_pve_phase_8.go
@@ -26,7 +26,7 @@ var ItemSetDawnstalkerProwess = core.NewItemSet(core.ItemSet{
 	},
 })
 
-// Your Strikes and Mongoose Bite deal 20% increased damage to targets afflicted with your Serpent Sting or Wyvern Strike.
+// Your Strikes and Mongoose Bite deal 25% increased damage to targets afflicted with your Serpent Sting or Wyvern Strike.
 func (hunter *Hunter) applyScarletEnclaveMelee2PBonus() {
 	label := "S03 - Item - Scarlet Enclave - Hunter - Melee 2P Bonus"
 	if hunter.HasAura(label) {
@@ -53,20 +53,20 @@ func (hunter *Hunter) applyScarletEnclaveMelee2PBonus() {
 			}
 
 			hasWyvernStrike := hunter.WyvernStrike != nil && hunter.WyvernStrike.Dot(result.Target).IsActive()
-			damageMod.UpdateFloatValue(core.TernaryFloat64(hasSerpentSting || hasWyvernStrike, 1.20, 1.0))
+			damageMod.UpdateFloatValue(core.TernaryFloat64(hasSerpentSting || hasWyvernStrike, 1.25, 1.0))
 			damageMod.Activate()
 		},
 	})
 }
 
-// Your melee critical strikes increase your attack speed by 20% for 10 sec.
+// Your melee critical strikes increase your attack speed by 30% for 10 sec.
 func (hunter *Hunter) applyScarletEnclaveMelee4PBonus() {
 	label := "S03 - Item - Scarlet Enclave - Hunter - Melee 4P Bonus"
 	if hunter.HasAura(label) {
 		return
 	}
 
-	attackSpeed := 1.20
+	attackSpeed := 1.30
 
 	procAura := core.MakePermanent(hunter.RegisterAura(core.Aura{
 		Label:    "Wicked Fast",
@@ -105,7 +105,7 @@ func (hunter *Hunter) applyScarletEnclaveMelee6PBonus() {
 	core.MakePermanent(hunter.RegisterAura(core.Aura{
 		Label: label,
 		OnInit: func(aura *core.Aura, sim *core.Simulation) {
-			hunter.BonusRaptorFuryDamageMultiplier = 0.10
+			hunter.BonusRaptorFuryDamageMultiplier = 0.15
 		},
 	}))
 }
@@ -128,7 +128,7 @@ var ItemSetDawnstalkerArmor = core.NewItemSet(core.ItemSet{
 	},
 })
 
-// Your Shots deal 20% increased damage to targets afflicted with your Serpent Sting.
+// Your Shots deal 25% increased damage to targets afflicted with your Serpent Sting.
 func (hunter *Hunter) applyScarletEnclaveRanged2PBonus() {
 	label := "S03 - Item - Scarlet Enclave - Hunter - Ranged 2P Bonus"
 	if hunter.HasAura(label) {
@@ -145,21 +145,21 @@ func (hunter *Hunter) applyScarletEnclaveRanged2PBonus() {
 		ClassSpellMask: ClassSpellMask_HunterShots,
 		Callback:       core.CallbackOnApplyEffects,
 		Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
-			damageMod.UpdateFloatValue(core.TernaryFloat64(hunter.SerpentSting.Dot(result.Target).IsActive(), 1.20, 1.0))
+			damageMod.UpdateFloatValue(core.TernaryFloat64(hunter.SerpentSting.Dot(result.Target).IsActive(), 1.25, 1.0))
 			damageMod.Activate()
 		},
 	})
 }
 
-// Your ranged critical strikes increase your Attack Power by 20% for 10 sec.
+// Your ranged critical strikes increase your Attack Power by 25% for 10 sec.
 func (hunter *Hunter) applyScarletEnclaveRanged4PBonus() {
 	label := "S03 - Item - Scarlet Enclave - Hunter - Ranged 4P Bonus"
 	if hunter.HasAura(label) {
 		return
 	}
 
-	apBonus := hunter.NewDynamicMultiplyStat(stats.AttackPower, 1.2)
-	apRangedBonus := hunter.NewDynamicMultiplyStat(stats.RangedAttackPower, 1.2)
+	apBonus := hunter.NewDynamicMultiplyStat(stats.AttackPower, 1.25)
+	apRangedBonus := hunter.NewDynamicMultiplyStat(stats.RangedAttackPower, 1.25)
 
 	procAura := hunter.GetOrRegisterAura(core.Aura{
 		Label:    "Wicked Shot",
@@ -185,10 +185,25 @@ func (hunter *Hunter) applyScarletEnclaveRanged6PBonus() {
 		return
 	}
 
+	damMod := hunter.AddDynamicMod(core.SpellModConfig{
+		Kind:      core.SpellMod_DamageDone_Flat,
+		ClassMask: ClassSpellMask_HunterMultiShot,
+	})
+
 	multishotAura := hunter.RegisterAura(core.Aura{
-		Label:    "Trick Shots",
-		ActionID: core.ActionID{SpellID: 1233451},
-		Duration: time.Minute * 5,
+		Label:     "Trick Shots",
+		ActionID:  core.ActionID{SpellID: 1233451},
+		Duration:  time.Minute * 5,
+		MaxStacks: 4,
+		OnGain: func(aura *core.Aura, sim *core.Simulation) {
+			damMod.Activate()
+		},
+		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
+			damMod.Deactivate()
+		},
+		OnStacksChange: func(aura *core.Aura, sim *core.Simulation, oldStacks, newStacks int32) {
+			damMod.UpdateIntValue(int64(50 * newStacks))
+		},
 		OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) {
 			if spell.Matches(ClassSpellMask_HunterMultiShot) {
 				aura.Deactivate(sim)
@@ -197,7 +212,6 @@ func (hunter *Hunter) applyScarletEnclaveRanged6PBonus() {
 	}).AttachSpellMod(core.SpellModConfig{
 		Kind:      core.SpellMod_DamageDone_Flat,
 		ClassMask: ClassSpellMask_HunterMultiShot,
-		IntValue:  100,
 	})
 
 	core.MakePermanent(hunter.RegisterAura(core.Aura{
@@ -206,12 +220,13 @@ func (hunter *Hunter) applyScarletEnclaveRanged6PBonus() {
 			hunter.MultiShotBonusTargets = 2
 		},
 	})).AttachProcTrigger(core.ProcTrigger{
-		Name:             label,
-		ClassSpellMask:   ClassSpellMask_HunterChimeraShot | ClassSpellMask_HunterKillShot,
-		Callback:         core.CallbackOnApplyEffects,
-		CanProcFromProcs: true,
+		Name:           label,
+		Callback:       core.CallbackOnSpellHitDealt,
+		Outcome:        core.OutcomeLanded,
+		ClassSpellMask: ClassSpellMask_HunterChimeraShot | ClassSpellMask_HunterChimeraSerpent | ClassSpellMask_HunterKillShot,
 		Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 			multishotAura.Activate(sim)
+			multishotAura.AddStack(sim)
 		},
 	})
 }
diff --git a/sim/hunter/items.go b/sim/hunter/items.go
index 40787b221e..863a8f7b80 100644
--- a/sim/hunter/items.go
+++ b/sim/hunter/items.go
@@ -688,7 +688,7 @@ func init() {
 	})
 
 	// https://www.wowhead.com/classic-ptr/item=240924/poleaxe-of-the-beast
-	// Equip: Focus Fire now grants you and your pet 3% increased damage per stack consumed for 20 sec.
+	// Equip: Focus Fire now grants you and your pet 5% increased damage per stack consumed for 20 sec.
 	core.NewItemEffect(PoleaxeOfTheBeast, func(agent core.Agent) {
 		hunter := agent.(HunterAgent).GetHunter()
 
@@ -740,7 +740,7 @@ func newBestialFocusAura(unit *core.Unit, spellID int32) *core.Aura {
 		Duration:  time.Second * 20,
 		MaxStacks: 5,
 		OnStacksChange: func(aura *core.Aura, sim *core.Simulation, oldStacks, newStacks int32) {
-			aura.Unit.PseudoStats.DamageDealtMultiplier *= ((1.0 + (0.03 * float64(newStacks))) / (1.0 + (0.03 * float64(oldStacks))))
+			aura.Unit.PseudoStats.DamageDealtMultiplier *= ((1.0 + (0.05 * float64(newStacks))) / (1.0 + (0.05 * float64(oldStacks))))
 		},
 	})
 }
diff --git a/sim/hunter/mongoose_bite.go b/sim/hunter/mongoose_bite.go
index 854f112442..c45fecc303 100644
--- a/sim/hunter/mongoose_bite.go
+++ b/sim/hunter/mongoose_bite.go
@@ -55,7 +55,7 @@ func (hunter *Hunter) getMongooseBiteConfig(rank int) core.SpellConfig {
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
 			hunter.DefensiveState.Deactivate(sim)
 
-			if hasMeleeSpecialist && sim.Proc(0.3, "Raptor Strike Reset") {
+			if hasMeleeSpecialist && sim.Proc(MeleeSpecialistProcChance, "Raptor Strike Reset") {
 				hunter.RaptorStrike.CD.Reset()
 				spell.CD.Reset()
 			}
diff --git a/sim/hunter/pet.go b/sim/hunter/pet.go
index f6e5e6b976..0de4b5e198 100644
--- a/sim/hunter/pet.go
+++ b/sim/hunter/pet.go
@@ -164,6 +164,11 @@ func (hunter *Hunter) NewHunterPet() *HunterPet {
 		hp.AddStat(stats.Expertise, 0.5*core.ExpertiseRatingPerExpertiseChance)
 	}
 
+	// Phase 8 - Given a special effect for BM hunters
+	if hunter.Ranged().Enchant.EffectID == 2523 {
+		hp.AddStat(stats.MeleeHit, 3*core.MeleeHitRatingPerHitChance)
+	}
+
 	hp.ApplyOnPetEnable(func(sim *core.Simulation) {
 		// Hunter pets only inherit the owner's melee speed
 		hp.EnableDynamicMeleeSpeedInheritance(sim)
diff --git a/sim/hunter/raptor_strike.go b/sim/hunter/raptor_strike.go
index 53bd942541..93f4b13934 100644
--- a/sim/hunter/raptor_strike.go
+++ b/sim/hunter/raptor_strike.go
@@ -70,7 +70,7 @@ func (hunter *Hunter) getRaptorStrikeConfig(rank int) core.SpellConfig {
 				hunter.curQueueAura.Deactivate(sim)
 			}
 
-			if hasMeleeSpecialist && sim.Proc(0.3, "Raptor Strike Reset") {
+			if hasMeleeSpecialist && sim.Proc(MeleeSpecialistProcChance, "Raptor Strike Reset") {
 				spell.CD.Reset()
 				hunter.MongooseBite.CD.Reset()
 			}
@@ -114,7 +114,7 @@ func (hunter *Hunter) newRaptorStrikeHitSpell(rank int, isMH bool) *core.Spell {
 		castType = proto.CastType_CastTypeOffHand
 		procMask = core.ProcMaskMeleeOHSpecial
 		damageMultiplier = hunter.AutoAttacks.OHConfig().DamageMultiplier
-		damageFunc = hunter.OHNormalizedWeaponDamage // https://www.wowhead.com/classic-ptr/spell=409755/raptor-strike
+		damageFunc = hunter.OHWeaponDamage // https://www.wowhead.com/classic-ptr/spell=409755/raptor-strike
 	}
 
 	return hunter.RegisterSpell(core.SpellConfig{
diff --git a/sim/hunter/runes.go b/sim/hunter/runes.go
index 3fe2e2bbcf..0b8332315b 100644
--- a/sim/hunter/runes.go
+++ b/sim/hunter/runes.go
@@ -128,6 +128,9 @@ func (hunter *Hunter) applyShoulderRuneEffect() {
 // 	}))
 // }
 
+// TODO: Make this an aura
+const MeleeSpecialistProcChance = 0.40
+
 func (hunter *Hunter) applyMasterMarksman() {
 	if hunter.HasRune(proto.HunterRune_RuneChestMasterMarksman) {
 		hunter.AddStat(stats.MeleeCrit, 5*core.CritRatingPerCritChance)
diff --git a/sim/mage/balefire_bolt.go b/sim/mage/balefire_bolt.go
index a816b0cb9e..15cc471474 100644
--- a/sim/mage/balefire_bolt.go
+++ b/sim/mage/balefire_bolt.go
@@ -22,7 +22,7 @@ func (mage *Mage) registerBalefireBoltSpell() {
 	manaCost := .20
 	maxStacks := 5
 	stackMultiplier := 0.20
-	stackModifier := int32(20)
+	stackModifier := int32(25)
 
 	damageMod := mage.AddDynamicMod(core.SpellModConfig{
 		Kind:      core.SpellMod_DamageDone_Flat,
@@ -30,7 +30,7 @@ func (mage *Mage) registerBalefireBoltSpell() {
 	})
 
 	statDeps := make([]*stats.StatDependency, maxStacks+1) // 5 stacks + zero conditions
-	for i := 1; i < maxStacks+1; i++ {
+	for i := 0; i < maxStacks+1; i++ {
 		statDeps[i] = mage.NewDynamicMultiplyStat(stats.Spirit, 1.0-stackMultiplier*float64(i))
 	}
 
@@ -41,17 +41,12 @@ func (mage *Mage) registerBalefireBoltSpell() {
 		MaxStacks: int32(maxStacks),
 		OnStacksChange: func(aura *core.Aura, sim *core.Simulation, oldStacks int32, newStacks int32) {
 			damageMod.UpdateIntValue(int64(stackModifier * newStacks))
-
-			if oldStacks != 0 {
-				aura.Unit.DisableDynamicStatDep(sim, statDeps[oldStacks])
-			}
-			if newStacks != 0 {
-				aura.Unit.EnableDynamicStatDep(sim, statDeps[newStacks])
-			}
-
-			if newStacks == aura.MaxStacks {
+			aura.Unit.DisableDynamicStatDep(sim, statDeps[oldStacks])
+			aura.Unit.EnableDynamicStatDep(sim, statDeps[newStacks])
+		},
+		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+			if spell.Matches(ClassSpellMask_MageBalefireBolt) && aura.GetStacks() == 5 {
 				mage.RemoveHealth(sim, mage.CurrentHealth(), mage.DamageTakenHealthMetrics)
-
 				if sim.Log != nil {
 					mage.Log(sim, "YOU DIED")
 				}
diff --git a/sim/mage/dps_mage/TestArcane.results b/sim/mage/dps_mage/TestArcane.results
index 84adc6fff2..131878a45b 100644
--- a/sim/mage/dps_mage/TestArcane.results
+++ b/sim/mage/dps_mage/TestArcane.results
@@ -298,10 +298,10 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.69727
+  weights: -0.73739
   weights: 0
-  weights: 1.12228
-  weights: 1.00754
+  weights: 1.14752
+  weights: 1.03279
   weights: 0.11474
   weights: 0
   weights: 0
@@ -309,7 +309,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 13.15905
+  weights: 13.54706
   weights: 0
   weights: 0
   weights: 0
@@ -347,18 +347,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.35817
+  weights: 0.37748
   weights: 0
-  weights: 2.08716
+  weights: 2.18371
   weights: 0
   weights: 0
-  weights: 2.08716
+  weights: 2.18371
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 24.09029
+  weights: 25.22627
   weights: 0
   weights: 0
   weights: 0
@@ -589,29 +589,29 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 682.86513
-  tps: 692.5317
+  dps: 709.91816
+  tps: 719.58473
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 626.27982
-  tps: 635.07815
+  dps: 650.72865
+  tps: 659.52697
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 678.30635
-  tps: 687.82648
+  dps: 705.17819
+  tps: 714.69832
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 624.72675
-  tps: 633.77159
+  dps: 649.15917
+  tps: 658.20401
  }
 }
 dps_results: {
@@ -624,22 +624,22 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 682.86513
-  tps: 692.5317
+  dps: 709.91816
+  tps: 719.58473
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 626.27982
-  tps: 635.07815
+  dps: 650.72865
+  tps: 659.52697
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1527.92958
-  tps: 1547.38005
+  dps: 1556.92645
+  tps: 1576.37692
  }
 }
 dps_results: {
@@ -652,99 +652,99 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 1893.03396
-  tps: 1912.91357
+  dps: 1930.13732
+  tps: 1950.01693
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1929.23127
-  tps: 2333.67284
+  dps: 1966.67669
+  tps: 2371.11825
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1929.23127
-  tps: 1949.45335
+  dps: 1966.67669
+  tps: 1986.89876
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2233.86585
-  tps: 2260.19419
+  dps: 2283.08921
+  tps: 2309.41755
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 770.88158
-  tps: 951.6284
+  dps: 781.7266
+  tps: 962.47342
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 770.88158
-  tps: 779.91892
+  dps: 781.7266
+  tps: 790.76394
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1179.74333
-  tps: 1194.92709
+  dps: 1201.19886
+  tps: 1216.38262
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1916.62411
-  tps: 2322.59172
+  dps: 1955.49791
+  tps: 2361.46553
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1916.62411
-  tps: 1936.92249
+  dps: 1955.49791
+  tps: 1975.79629
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2256.7717
-  tps: 2284.08016
+  dps: 2306.0396
+  tps: 2333.34806
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 740.73198
-  tps: 921.4788
+  dps: 750.68956
+  tps: 931.43638
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 740.73198
-  tps: 749.76932
+  dps: 750.68956
+  tps: 759.7269
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1190.14083
-  tps: 1205.32459
+  dps: 1210.99957
+  tps: 1226.18333
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1916.62411
-  tps: 1936.92249
+  dps: 1955.49791
+  tps: 1975.79629
  }
 }
 dps_results: {
@@ -813,98 +813,98 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 3247.90269
-  tps: 2091.54139
+  dps: 3399.61468
+  tps: 2182.56859
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 7491.95826
-  tps: 4895.18485
+  dps: 7644.28834
+  tps: 4986.5829
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 3225.51195
-  tps: 2073.66001
+  dps: 3376.57816
+  tps: 2164.29973
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 3869.55016
-  tps: 2557.29934
+  dps: 4028.62031
+  tps: 2652.74143
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 3995.49064
-  tps: 2645.50482
+  dps: 4074.10627
+  tps: 2692.6742
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1698.02475
-  tps: 1094.99687
+  dps: 1777.61335
+  tps: 1142.75003
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Gnome-p5_arcane-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2169.5008
-  tps: 1452.31885
+  dps: 2257.99355
+  tps: 1505.4145
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 7494.13617
-  tps: 4905.67476
+  dps: 7646.27633
+  tps: 4996.95885
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 3228.0979
-  tps: 2074.65162
+  dps: 3379.28274
+  tps: 2165.36252
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 3865.05142
-  tps: 2552.897
+  dps: 4023.45702
+  tps: 2647.94036
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 3987.09428
-  tps: 2642.72236
+  dps: 4065.18213
+  tps: 2689.57507
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1682.1464
-  tps: 1087.61397
+  dps: 1760.62783
+  tps: 1134.70282
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-Settings-Troll-p5_arcane-Arcane-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2136.41513
-  tps: 1424.39205
+  dps: 2224.01096
+  tps: 1476.94955
  }
 }
 dps_results: {
  key: "TestArcane-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3228.0979
-  tps: 2074.65162
+  dps: 3379.28274
+  tps: 2165.36252
  }
 }
diff --git a/sim/mage/dps_mage/TestFire.results b/sim/mage/dps_mage/TestFire.results
index b66ed7b677..30a1f11a83 100644
--- a/sim/mage/dps_mage/TestFire.results
+++ b/sim/mage/dps_mage/TestFire.results
@@ -494,18 +494,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 3.33991
+  weights: 3.35846
   weights: 0
-  weights: 1.8603
+  weights: 1.88564
   weights: 0
-  weights: 1.8603
+  weights: 1.88564
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 27.52851
+  weights: 27.86528
   weights: 0
   weights: 0
   weights: 0
@@ -543,18 +543,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 6.36418
+  weights: 6.37808
   weights: 0
-  weights: 2.02955
+  weights: 2.05478
   weights: 0
-  weights: 2.02955
+  weights: 2.05478
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 37.24384
+  weights: 37.51792
   weights: 0
   weights: 0
   weights: 0
@@ -592,18 +592,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 2.31461
+  weights: 2.30913
   weights: 0
-  weights: 3.10026
+  weights: 3.19154
   weights: 0
-  weights: 3.10026
+  weights: 3.19154
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 49.00346
+  weights: 50.52041
   weights: 0
   weights: 0
   weights: 0
@@ -641,18 +641,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.39982
+  weights: 0.40958
   weights: 0
-  weights: 3.18146
+  weights: 3.27469
   weights: 0
-  weights: 3.18146
+  weights: 3.27469
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 49.94422
+  weights: 51.58379
   weights: 0
   weights: 0
   weights: 0
@@ -981,29 +981,29 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 1877.5556
-  tps: 1230.12973
+  dps: 1905.64081
+  tps: 1244.33297
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 1692.9208
-  tps: 1107.71831
+  dps: 1718.76019
+  tps: 1120.69166
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 1838.6897
-  tps: 1205.92751
+  dps: 1865.43375
+  tps: 1219.37992
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 1692.32988
-  tps: 1111.46445
+  dps: 1716.80775
+  tps: 1123.71834
  }
 }
 dps_results: {
@@ -1016,22 +1016,22 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 1877.5556
-  tps: 1230.12973
+  dps: 1905.64081
+  tps: 1244.33297
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 1692.9208
-  tps: 1107.71831
+  dps: 1718.76019
+  tps: 1120.69166
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1981.24914
-  tps: 1297.07026
+  dps: 2010.34428
+  tps: 1311.73688
  }
 }
 dps_results: {
@@ -1044,127 +1044,127 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 2808.50095
-  tps: 1848.61907
+  dps: 2848.20585
+  tps: 1869.19007
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2787.62363
-  tps: 2273.17347
+  dps: 2829.03468
+  tps: 2294.59368
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2787.62363
-  tps: 1827.42822
+  dps: 2829.03468
+  tps: 1848.84842
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3369.78009
-  tps: 2159.20029
+  dps: 3438.36937
+  tps: 2194.85058
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 712.2633
-  tps: 701.94847
+  dps: 725.04656
+  tps: 708.07701
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 712.2633
-  tps: 455.21982
+  dps: 725.04656
+  tps: 461.34836
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1578.10818
-  tps: 1000.21238
+  dps: 1608.32317
+  tps: 1014.58796
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2803.82658
-  tps: 2292.63663
+  dps: 2841.65
+  tps: 2312.12772
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2803.82658
-  tps: 1848.23234
+  dps: 2841.65
+  tps: 1867.72343
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3503.80614
-  tps: 2260.36209
+  dps: 3569.8589
+  tps: 2294.63284
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 694.65605
-  tps: 689.35129
+  dps: 706.81618
+  tps: 695.19336
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 694.65605
-  tps: 445.08048
+  dps: 706.81618
+  tps: 450.92256
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1620.79391
-  tps: 1031.88011
+  dps: 1651.33148
+  tps: 1046.53714
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2803.82658
-  tps: 1848.23234
+  dps: 2841.65
+  tps: 1867.72343
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 2104.72919
-  tps: 1377.47149
+  dps: 2136.91187
+  tps: 1393.83368
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 1984.02933
-  tps: 1300.40724
+  dps: 2014.16367
+  tps: 1315.65921
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 2035.66824
-  tps: 1333.45204
+  dps: 2066.17322
+  tps: 1348.93406
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 1880.2253
-  tps: 1234.46924
+  dps: 1908.11431
+  tps: 1248.58099
  }
 }
 dps_results: {
@@ -1177,22 +1177,22 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 2104.72919
-  tps: 1377.47149
+  dps: 2136.91187
+  tps: 1393.83368
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 1984.02933
-  tps: 1300.40724
+  dps: 2014.16367
+  tps: 1315.65921
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 2764.75811
-  tps: 1464.78706
+  dps: 2800.613
+  tps: 1479.32909
  }
 }
 dps_results: {
@@ -1205,29 +1205,29 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 3150.54922
-  tps: 1674.87178
+  dps: 3190.13169
+  tps: 1691.15742
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 1317.61613
-  tps: 1036.62538
+  dps: 1318.47844
+  tps: 1036.97678
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 3381.26859
-  tps: 1792.92206
+  dps: 3424.90884
+  tps: 1810.89051
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4097.98448
-  tps: 2159.97559
+  dps: 4160.14848
+  tps: 2185.86574
  }
 }
 dps_results: {
@@ -1240,36 +1240,36 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 837.99232
-  tps: 439.32002
+  dps: 850.52872
+  tps: 444.05995
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 1837.29675
-  tps: 961.35751
+  dps: 1864.36937
+  tps: 971.64542
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 1307.90661
-  tps: 1026.82705
+  dps: 1308.82241
+  tps: 1027.20832
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 3137.44945
-  tps: 1669.14848
+  dps: 3176.16179
+  tps: 1685.05832
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4113.46477
-  tps: 2174.71798
+  dps: 4175.31116
+  tps: 2200.61081
  }
 }
 dps_results: {
@@ -1282,50 +1282,50 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 781.50816
-  tps: 406.90383
+  dps: 794.1241
+  tps: 411.67236
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 1825.70243
-  tps: 955.59931
+  dps: 1852.06572
+  tps: 965.56669
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3137.44945
-  tps: 1669.14848
+  dps: 3176.16179
+  tps: 1685.05832
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 2279.38748
-  tps: 1634.51956
+  dps: 2306.77094
+  tps: 1653.68798
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 2059.26519
-  tps: 1479.40844
+  dps: 2083.05846
+  tps: 1496.06373
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 2264.87898
-  tps: 1624.24985
+  dps: 2292.04295
+  tps: 1643.26463
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 2058.78989
-  tps: 1479.14555
+  dps: 2082.58847
+  tps: 1495.80455
  }
 }
 dps_results: {
@@ -1338,22 +1338,22 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase6-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 2279.38748
-  tps: 1634.51956
+  dps: 2306.77094
+  tps: 1653.68798
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 2059.26519
-  tps: 1479.40844
+  dps: 2083.05846
+  tps: 1496.06373
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 4084.87032
-  tps: 2899.37867
+  dps: 4205.12376
+  tps: 2983.55608
  }
 }
 dps_results: {
@@ -1366,57 +1366,57 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase6-Lvl60-Average-Default"
  value: {
-  dps: 5927.99006
-  tps: 4190.37829
+  dps: 6100.31179
+  tps: 4311.0035
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-Settings-Troll-p6_fire-p6_fire-p6_fire-FullBuffs-p6_fire-LongMultiTarget"
  value: {
-  dps: 7241.32725
-  tps: 5877.53985
+  dps: 7414.83149
+  tps: 5998.99281
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-Settings-Troll-p6_fire-p6_fire-p6_fire-FullBuffs-p6_fire-LongSingleTarget"
  value: {
-  dps: 5908.4089
-  tps: 4176.90447
+  dps: 6083.02004
+  tps: 4299.13227
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-Settings-Troll-p6_fire-p6_fire-p6_fire-FullBuffs-p6_fire-ShortSingleTarget"
  value: {
-  dps: 5861.5948
-  tps: 4146.71173
+  dps: 6040.32739
+  tps: 4271.82455
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-Settings-Troll-p6_fire-p6_fire-p6_fire-NoBuffs-p6_fire-LongMultiTarget"
  value: {
-  dps: 2101.07413
-  tps: 1916.57769
+  dps: 2144.08466
+  tps: 1946.68506
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-Settings-Troll-p6_fire-p6_fire-p6_fire-NoBuffs-p6_fire-LongSingleTarget"
  value: {
-  dps: 1567.31672
-  tps: 1119.42361
+  dps: 1607.83253
+  tps: 1147.78468
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-Settings-Troll-p6_fire-p6_fire-p6_fire-NoBuffs-p6_fire-ShortSingleTarget"
  value: {
-  dps: 2555.23217
-  tps: 1825.46077
+  dps: 2627.4739
+  tps: 1876.02998
  }
 }
 dps_results: {
  key: "TestFire-Phase6-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 5908.4089
-  tps: 4176.90447
+  dps: 6083.02004
+  tps: 4299.13227
  }
 }
 dps_results: {
@@ -1471,8 +1471,8 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase7-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 4068.77304
-  tps: 2888.4351
+  dps: 4186.56934
+  tps: 2970.89251
  }
 }
 dps_results: {
@@ -1485,56 +1485,56 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase7-Lvl60-Average-Default"
  value: {
-  dps: 6530.18829
-  tps: 4613.65698
+  dps: 6720.2033
+  tps: 4746.66748
  }
 }
 dps_results: {
  key: "TestFire-Phase7-Lvl60-Settings-Troll-p7_fire-p7_fire-p7_fire-FullBuffs-p7_fire-LongMultiTarget"
  value: {
-  dps: 7980.11455
-  tps: 6426.66861
+  dps: 8165.70067
+  tps: 6556.57889
  }
 }
 dps_results: {
  key: "TestFire-Phase7-Lvl60-Settings-Troll-p7_fire-p7_fire-p7_fire-FullBuffs-p7_fire-LongSingleTarget"
  value: {
-  dps: 6580.74073
-  tps: 4649.10549
+  dps: 6774.4423
+  tps: 4784.69659
  }
 }
 dps_results: {
  key: "TestFire-Phase7-Lvl60-Settings-Troll-p7_fire-p7_fire-p7_fire-FullBuffs-p7_fire-ShortSingleTarget"
  value: {
-  dps: 7351.69937
-  tps: 5196.19656
+  dps: 7573.27112
+  tps: 5351.29679
  }
 }
 dps_results: {
  key: "TestFire-Phase7-Lvl60-Settings-Troll-p7_fire-p7_fire-p7_fire-NoBuffs-p7_fire-LongMultiTarget"
  value: {
-  dps: 2473.61348
-  tps: 2186.36277
+  dps: 2524.37047
+  tps: 2221.89267
  }
 }
 dps_results: {
  key: "TestFire-Phase7-Lvl60-Settings-Troll-p7_fire-p7_fire-p7_fire-NoBuffs-p7_fire-LongSingleTarget"
  value: {
-  dps: 1948.77311
-  tps: 1387.03628
+  dps: 1999.42281
+  tps: 1422.49107
  }
 }
 dps_results: {
  key: "TestFire-Phase7-Lvl60-Settings-Troll-p7_fire-p7_fire-p7_fire-NoBuffs-p7_fire-ShortSingleTarget"
  value: {
-  dps: 3074.24539
-  tps: 2189.14379
+  dps: 3166.7188
+  tps: 2253.87517
  }
 }
 dps_results: {
  key: "TestFire-Phase7-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6580.74073
-  tps: 4649.10549
+  dps: 6774.4423
+  tps: 4784.69659
  }
 }
diff --git a/sim/mage/dps_mage/TestFrost.results b/sim/mage/dps_mage/TestFrost.results
index 5cc6478bde..bf4c45a163 100644
--- a/sim/mage/dps_mage/TestFrost.results
+++ b/sim/mage/dps_mage/TestFrost.results
@@ -298,18 +298,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 2.13431
+  weights: 2.27472
   weights: 0
-  weights: 2.02072
+  weights: 2.04253
   weights: 0
-  weights: 1.80198
+  weights: 1.82379
   weights: 0.21874
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 27.6846
+  weights: 28.04121
   weights: 0
   weights: 0
   weights: 0
@@ -347,18 +347,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.55749
+  weights: 1.62465
   weights: 0
-  weights: 2.07394
+  weights: 2.17414
   weights: 0
   weights: 0
-  weights: 2.07394
+  weights: 2.17414
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 18.37836
+  weights: 19.24963
   weights: 0
   weights: 0
   weights: 0
@@ -396,18 +396,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.48238
+  weights: 0.50658
   weights: 0
-  weights: 3.25177
+  weights: 3.34799
   weights: 0
   weights: 0
-  weights: 3.25177
+  weights: 3.34799
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 13.80158
+  weights: 14.441
   weights: 0
   weights: 0
   weights: 0
@@ -589,29 +589,29 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 1574.06744
-  tps: 1290.11406
+  dps: 1600.28943
+  tps: 1310.72699
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 1452.42924
-  tps: 1188.6771
+  dps: 1474.84695
+  tps: 1206.11157
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 1568.73938
-  tps: 1285.38315
+  dps: 1593.88223
+  tps: 1305.08211
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 1447.89552
-  tps: 1186.26536
+  dps: 1471.03261
+  tps: 1204.3545
  }
 }
 dps_results: {
@@ -624,15 +624,15 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 1574.06744
-  tps: 1290.11406
+  dps: 1600.28943
+  tps: 1310.72699
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 1452.42924
-  tps: 1188.6771
+  dps: 1474.84695
+  tps: 1206.11157
  }
 }
 dps_results: {
@@ -652,99 +652,99 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 2820.80453
-  tps: 2312.88343
+  dps: 2853.12946
+  tps: 2338.56038
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2817.68897
-  tps: 2730.03311
+  dps: 2847.60697
+  tps: 2753.60424
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2817.68897
-  tps: 2311.04266
+  dps: 2847.60697
+  tps: 2334.6138
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3054.06172
-  tps: 2490.71277
+  dps: 3079.00218
+  tps: 2510.21506
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 776.65888
-  tps: 864.41552
+  dps: 783.72195
+  tps: 869.73185
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 776.65888
-  tps: 633.70754
+  dps: 783.72195
+  tps: 639.02388
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1504.78966
-  tps: 1215.50356
+  dps: 1516.74614
+  tps: 1224.59166
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2818.45806
-  tps: 2727.41385
+  dps: 2849.49044
+  tps: 2751.97227
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2818.45806
-  tps: 2309.51596
+  dps: 2849.49044
+  tps: 2334.07438
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3095.26518
-  tps: 2523.55118
+  dps: 3123.14014
+  tps: 2545.61266
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 780.98426
-  tps: 867.36803
+  dps: 787.76232
+  tps: 872.48919
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 780.98426
-  tps: 636.67653
+  dps: 787.76232
+  tps: 641.79769
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1539.35516
-  tps: 1241.69106
+  dps: 1551.11686
+  tps: 1250.60804
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2818.45806
-  tps: 2309.51596
+  dps: 2849.49044
+  tps: 2334.07438
  }
 }
 dps_results: {
@@ -813,99 +813,99 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 3306.90032
-  tps: 2328.81496
+  dps: 3468.26143
+  tps: 2441.76774
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 7552.26634
-  tps: 5580.61861
+  dps: 7717.42276
+  tps: 5696.2281
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 3338.15881
-  tps: 2351.18724
+  dps: 3501.47723
+  tps: 2465.51014
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 3926.26962
-  tps: 2767.56109
+  dps: 4103.81046
+  tps: 2891.83968
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 4037.53374
-  tps: 3007.02045
+  dps: 4124.75484
+  tps: 3068.07521
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1783.43233
-  tps: 1257.43997
+  dps: 1870.30064
+  tps: 1318.24779
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Gnome-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2315.60365
-  tps: 1636.10631
+  dps: 2421.11781
+  tps: 1709.96623
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 7492.75478
-  tps: 5521.92021
+  dps: 7656.07974
+  tps: 5636.24768
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 3295.54616
-  tps: 2320.76324
+  dps: 3456.47582
+  tps: 2433.414
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 3939.47586
-  tps: 2780.01177
+  dps: 4116.66727
+  tps: 2904.04576
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 3969.22842
-  tps: 2959.20672
+  dps: 4055.07029
+  tps: 3019.29603
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1740.30932
-  tps: 1227.25387
+  dps: 1824.87695
+  tps: 1286.45121
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-Settings-Troll-p5_frost-Frost-p5_spellfrost-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2335.29892
-  tps: 1649.893
+  dps: 2440.69071
+  tps: 1723.66725
  }
 }
 dps_results: {
  key: "TestFrost-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3295.54616
-  tps: 2320.76324
+  dps: 3456.47582
+  tps: 2433.414
  }
 }
 dps_results: {
@@ -974,57 +974,57 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase6-Lvl60-Average-Default"
  value: {
-  dps: 5783.27239
-  tps: 4075.377
+  dps: 5970.83352
+  tps: 4206.66979
  }
 }
 dps_results: {
  key: "TestFrost-Phase6-Lvl60-Settings-Troll-p6_frost-p6_frost-p6_frost-FullBuffs-p6_frost-LongMultiTarget"
  value: {
-  dps: 12502.21636
-  tps: 9293.22283
+  dps: 12693.28107
+  tps: 9426.96812
  }
 }
 dps_results: {
  key: "TestFrost-Phase6-Lvl60-Settings-Troll-p6_frost-p6_frost-p6_frost-FullBuffs-p6_frost-LongSingleTarget"
  value: {
-  dps: 5789.22363
-  tps: 4079.54011
+  dps: 5975.69911
+  tps: 4210.07295
  }
 }
 dps_results: {
  key: "TestFrost-Phase6-Lvl60-Settings-Troll-p6_frost-p6_frost-p6_frost-FullBuffs-p6_frost-ShortSingleTarget"
  value: {
-  dps: 6634.99775
-  tps: 4675.0033
+  dps: 6832.0397
+  tps: 4812.93266
  }
 }
 dps_results: {
  key: "TestFrost-Phase6-Lvl60-Settings-Troll-p6_frost-p6_frost-p6_frost-NoBuffs-p6_frost-LongMultiTarget"
  value: {
-  dps: 5854.7348
-  tps: 4382.08796
+  dps: 5940.13265
+  tps: 4441.86646
  }
 }
 dps_results: {
  key: "TestFrost-Phase6-Lvl60-Settings-Troll-p6_frost-p6_frost-p6_frost-NoBuffs-p6_frost-LongSingleTarget"
  value: {
-  dps: 2820.75078
-  tps: 1988.71422
+  dps: 2903.98007
+  tps: 2046.97473
  }
 }
 dps_results: {
  key: "TestFrost-Phase6-Lvl60-Settings-Troll-p6_frost-p6_frost-p6_frost-NoBuffs-p6_frost-ShortSingleTarget"
  value: {
-  dps: 3363.68462
-  tps: 2378.99289
+  dps: 3455.85825
+  tps: 2443.51444
  }
 }
 dps_results: {
  key: "TestFrost-Phase6-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 5789.22363
-  tps: 4079.54011
+  dps: 5975.69911
+  tps: 4210.07295
  }
 }
 dps_results: {
diff --git a/sim/mage/ice_lance.go b/sim/mage/ice_lance.go
index a94e656021..e07daed2db 100644
--- a/sim/mage/ice_lance.go
+++ b/sim/mage/ice_lance.go
@@ -40,7 +40,7 @@ func (mage *Mage) registerIceLanceSpell() {
 		Flags:          core.SpellFlagAPL,
 
 		MissileSpeed: 38,
-		MetricSplits: 9, // Possible 8 total stacks
+		MetricSplits: 11, // Possible 8 total stacks
 
 		ManaCost: core.ManaCostOptions{
 			BaseCost: manaCost,
diff --git a/sim/mage/item_sets_pve_phase_5.go b/sim/mage/item_sets_pve_phase_5.go
index 0d9cf3821b..ebe9118163 100644
--- a/sim/mage/item_sets_pve_phase_5.go
+++ b/sim/mage/item_sets_pve_phase_5.go
@@ -216,7 +216,7 @@ func (mage *Mage) applyZGFrost3PBonus() {
 	})
 }
 
-// Increases damage done by your Frostbolt and Spellfrost Bolt spells by 65%.
+// Increases damage done by your Frostbolt and Spellfrost Bolt spells by 75%.
 func (mage *Mage) applyZGFrost5PBonus() {
 	label := "S03 - Item - ZG - Mage - Frost 5P Bonus"
 	if mage.HasAura(label) {
@@ -228,6 +228,6 @@ func (mage *Mage) applyZGFrost5PBonus() {
 	}).AttachSpellMod(core.SpellModConfig{
 		Kind:      core.SpellMod_DamageDone_Flat,
 		ClassMask: ClassSpellMask_MageFrostbolt | ClassSpellMask_MageSpellfrostBolt,
-		IntValue:  65,
+		IntValue:  75,
 	}))
 }
diff --git a/sim/mage/item_sets_pve_phase_6.go b/sim/mage/item_sets_pve_phase_6.go
index 2f51d0cfd7..fdc1f7322e 100644
--- a/sim/mage/item_sets_pve_phase_6.go
+++ b/sim/mage/item_sets_pve_phase_6.go
@@ -132,15 +132,15 @@ var ItemSetTrappingsOfVaultedSecrets = core.NewItemSet(core.ItemSet{
 	},
 })
 
-// Your Fireball, Frostfire Bolt, and Balefire Bolt spells gain 3% increased damage for each of your Fire effects on your target, up to a maximum increased of 9%.
+// Your Fireball, Frostfire Bolt, and Balefire Bolt spells gain 4% increased damage for each of your Fire effects on your target, up to a maximum increased of 12%.
 func (mage *Mage) applyRAQFire3PBonus() {
 	label := "S03 - Item - RAQ - Mage - Fire 3P Bonus"
 	if mage.HasAura(label) {
 		return
 	}
 
-	perEffectMultiplier := 0.03
-	maxMultiplier := 1.09
+	perEffectMultiplier := 0.04
+	maxMultiplier := 1.12
 
 	classSpellMasks := ClassSpellMask_MageFireball | ClassSpellMask_MageFrostfireBolt | ClassSpellMask_MageBalefireBolt
 	damageMod := mage.AddDynamicMod(core.SpellModConfig{
diff --git a/sim/mage/item_sets_pve_phase_8.go b/sim/mage/item_sets_pve_phase_8.go
index 9f3ce9b338..c50f6d52b9 100644
--- a/sim/mage/item_sets_pve_phase_8.go
+++ b/sim/mage/item_sets_pve_phase_8.go
@@ -26,7 +26,7 @@ var ItemSetFireleafRegalia = core.NewItemSet(core.ItemSet{
 })
 
 // Living Bomb ticks every 1 second and when it explodes it spreads Living Bomb to all targets struck that don't have an active Living Bomb.
-// Glaciate now stacks to 8 and Spellfrost Bolt grants 2 stacks per hit.
+// Glaciate now stacks to 10 and Spellfrost Bolt grants 2 stacks per hit.
 func (mage *Mage) applyScarletEnclaveDamage2PBonus() {
 	label := "S03 - Item - Scarlet Enclave - Mage - Damage 2P Bonus"
 	if mage.HasAura(label) {
@@ -65,7 +65,7 @@ func (mage *Mage) applyScarletEnclaveDamage2PBonus() {
 					continue
 				}
 
-				aura.MaxStacks += 3
+				aura.MaxStacks += 5
 			}
 		}).ApplyOnSpellHitDealt(func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 			if spell.Matches(ClassSpellMask_MageSpellfrostBolt) && result.Landed() {
@@ -76,8 +76,8 @@ func (mage *Mage) applyScarletEnclaveDamage2PBonus() {
 	}
 }
 
-// Casting Deep Freeze increases the remaining duration of your Icy Veins spell by 8 sec.
-// Casting Pyroblast cancels 1 stack of the effect from your Balefire Bolt.
+// Casting Deep Freeze increases the remaining duration of your Icy Veins spell by 10 sec.
+// Casting Pyroblast cancels 2 stack of the effect from your Balefire Bolt.
 func (mage *Mage) applyScarletEnclaveDamage4PBonus() {
 	label := "S03 - Item - Scarlet Enclave - Mage - Damage 4P Bonus"
 	if mage.HasAura(label) {
@@ -91,7 +91,11 @@ func (mage *Mage) applyScarletEnclaveDamage4PBonus() {
 	if mage.HasRune(proto.MageRune_RuneBracersBalefireBolt) && mage.Talents.Pyroblast {
 		aura.ApplyOnCastComplete(func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) {
 			if spell.Matches(ClassSpellMask_MagePyroblast) && mage.BalefireAura.IsActive() && mage.BalefireAura.GetStacks() > 0 {
+				// These have to be separate
 				mage.BalefireAura.RemoveStack(sim)
+				if mage.BalefireAura.GetStacks() == 0 {
+					mage.BalefireAura.Deactivate(sim)
+				}
 			}
 		}, false)
 	}
@@ -99,13 +103,13 @@ func (mage *Mage) applyScarletEnclaveDamage4PBonus() {
 	if mage.HasRune(proto.MageRune_RuneHelmDeepFreeze) && mage.HasRune(proto.MageRune_RuneLegsIcyVeins) {
 		aura.ApplyOnCastComplete(func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) {
 			if spell.Matches(ClassSpellMask_MageDeepFreeze) && mage.IcyVeinsAura.IsActive() {
-				mage.IcyVeinsAura.UpdateExpires(sim, mage.IcyVeinsAura.ExpiresAt()+time.Second*8)
+				mage.IcyVeinsAura.UpdateExpires(sim, mage.IcyVeinsAura.ExpiresAt()+time.Second*10)
 			}
 		}, false)
 	}
 }
 
-// Reduces the cooldown on your Frozen Orb spell by 20 sec.
+// Reduces the cooldown on your Frozen Orb spell by 25 sec.
 // Each time Glaciate is consumed, the cooldown on your Deep Freeze is reduced by 1.0 sec per stack consumed.
 // Reduces the cooldown on Fire Blast by 5 sec and Fire Blast now refreshes the duration of your Living Bomb on the target.
 func (mage *Mage) applyScarletEnclaveDamage6PBonus() {
@@ -122,7 +126,7 @@ func (mage *Mage) applyScarletEnclaveDamage6PBonus() {
 		aura.AttachSpellMod(core.SpellModConfig{
 			Kind:      core.SpellMod_Cooldown_Flat,
 			ClassMask: ClassSpellMask_MageFrozenOrb,
-			TimeValue: -time.Second * 20,
+			TimeValue: -time.Second * 25,
 		})
 	}
 
diff --git a/sim/mage/mage.go b/sim/mage/mage.go
index f8693318e2..558853dccd 100644
--- a/sim/mage/mage.go
+++ b/sim/mage/mage.go
@@ -63,13 +63,12 @@ const (
 	ClassSpellMask_MageChanneled = ClassSpellMask_MageArcaneMissiles | ClassSpellMask_MageEvocation | ClassSpellMask_MageMassRegeneration
 
 	// TODO: Cone of Cold, Frost Nova
-	// Deep Freeze missing on Wowhead
 	ClassSpellMask_MageHarmfulGCDSpells = ClassSpellMask_MageFireball | ClassSpellMask_MageFrostbolt | ClassSpellMask_MageFireBlast |
 		ClassSpellMask_MagePyroblast | ClassSpellMask_MageScorch | ClassSpellMask_MageArcaneMissiles |
 		ClassSpellMask_MageArcaneExplosion | ClassSpellMask_MageBlizzard | ClassSpellMask_MageFlamestrike |
 		ClassSpellMask_MageBlastWave |
 		ClassSpellMask_MageFrostfireBolt | ClassSpellMask_MageSpellfrostBolt | ClassSpellMask_MageArcaneBlast |
-		ClassSpellMask_MageBalefireBolt | ClassSpellMask_MageArcaneBarrage | ClassSpellMask_MageLivingBomb |
+		ClassSpellMask_MageBalefireBolt | ClassSpellMask_MageArcaneBarrage | ClassSpellMask_MageLivingBomb | ClassSpellMask_MageDeepFreeze |
 		ClassSpellMask_MageIceLance | ClassSpellMask_MageLivingFlame | ClassSpellMask_MageArcaneSurge | ClassSpellMask_MageFrozenOrb
 )
 
diff --git a/sim/paladin/item_sets_pve.go b/sim/paladin/item_sets_pve.go
index 4fd37410c7..364b567c3d 100644
--- a/sim/paladin/item_sets_pve.go
+++ b/sim/paladin/item_sets_pve.go
@@ -603,7 +603,7 @@ func (paladin *Paladin) applyPaladinT1Ret6P() {
 	})).AttachSpellMod(core.SpellModConfig{
 		Kind:       core.SpellMod_DamageDone_Pct,
 		ClassMask:  ClassSpellMask_PaladinSeals,
-		FloatValue: 1 / 1.15,
+		FloatValue: 0.65,
 	})
 }
 
@@ -630,7 +630,7 @@ func (paladin *Paladin) applyPaladinT2Ret2P() {
 	}).AttachSpellMod(core.SpellModConfig{
 		Kind:      core.SpellMod_DamageDone_Flat,
 		ClassMask: ClassSpellMask_PaladinJudgements,
-		IntValue:  20,
+		IntValue:  5,
 	}))
 }
 
@@ -647,7 +647,7 @@ func (paladin *Paladin) applyPaladinT2Ret4P() {
 	}).AttachSpellMod(core.SpellModConfig{
 		Kind:      core.SpellMod_Cooldown_Flat,
 		ClassMask: ClassSpellMask_PaladinJudgement,
-		TimeValue: -5 * time.Second,
+		TimeValue: -2 * time.Second,
 	}))
 }
 
diff --git a/sim/paladin/items.go b/sim/paladin/items.go
index 532879e930..43e40e768e 100644
--- a/sim/paladin/items.go
+++ b/sim/paladin/items.go
@@ -376,7 +376,7 @@ func init() {
 	// https://www.wowhead.com/classic-ptr/item=240920/leogan
 	// Equip: Adds 2 holy damage to your melee attacks.
 	// Equip: The Global Cooldown of your Exorcism and Holy Wrath spells is reduced by 0.5 seconds.
-	// Chance on hit: Increases the wielder's Strength by 250 for 15 sec.
+	// Chance on hit: Increases the wielder's Strength by 200 for 15 sec.
 	// TODO: Proc rate assumed and needs testing
 	core.NewItemEffect(Leogan, func(agent core.Agent) {
 		paladin := agent.(PaladinAgent).GetPaladin()
@@ -389,7 +389,7 @@ func init() {
 
 		vanilla.BlazefuryTriggerAura(&paladin.Character, Leogan, 1231550, 1231549, core.SpellSchoolHoly, 2)
 		itemhelpers.AddWeaponProcAura(paladin.GetCharacter(), Leogan, "Leogan", 2.0, func(character *core.Character) *core.Aura {
-			return paladin.NewTemporaryStatsAura("Holy Might", core.ActionID{SpellID: 1231548}, stats.Stats{stats.Strength: 250}, time.Second*15)
+			return paladin.NewTemporaryStatsAura("Holy Might", core.ActionID{SpellID: 1231548}, stats.Stats{stats.Strength: 200}, time.Second*15)
 		})
 	})
 
diff --git a/sim/paladin/retribution/TestExodin.results b/sim/paladin/retribution/TestExodin.results
index f373b7a496..554115eec8 100644
--- a/sim/paladin/retribution/TestExodin.results
+++ b/sim/paladin/retribution/TestExodin.results
@@ -197,12 +197,12 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestExodin-Phase4-Lvl60-StatWeights-Default"
  value: {
-  weights: 1.98582
-  weights: 1.87152
+  weights: 1.76704
+  weights: 1.64066
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.67789
+  weights: 0.60257
   weights: 0
   weights: 0
   weights: 0
@@ -210,16 +210,16 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 9.09304
-  weights: 1.91991
+  weights: 9.07032
+  weights: 1.53699
   weights: 0
   weights: 0
-  weights: 0.82059
+  weights: 0.73018
   weights: 0
-  weights: 21.05728
+  weights: 18.11204
   weights: 0
   weights: 0
-  weights: 41.68706
+  weights: 35.27032
   weights: 0
   weights: 0
   weights: 0
@@ -246,12 +246,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestExodin-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.80787
-  weights: 1.42815
+  weights: 2.46945
+  weights: 1.20069
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.88911
+  weights: 0.77617
   weights: 0
   weights: 0
   weights: 0
@@ -259,16 +259,16 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 17.21012
-  weights: 3.80111
+  weights: 16.20261
+  weights: 3.33639
   weights: 0
   weights: 0
-  weights: 1.00894
+  weights: 0.88733
   weights: 0
-  weights: 23.13074
+  weights: 20.32945
   weights: 0
   weights: 0
-  weights: 46.26891
+  weights: 38.47036
   weights: 0
   weights: 0
   weights: 0
@@ -295,12 +295,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestExodin-Phase6-Lvl60-StatWeights-Default"
  value: {
-  weights: 3.32651
-  weights: 2.52104
+  weights: 2.96207
+  weights: 2.66342
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.85225
+  weights: 0.81732
   weights: 0
   weights: 0
   weights: 0
@@ -308,16 +308,16 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 21.81155
-  weights: 3.9563
+  weights: 19.75421
+  weights: 3.51713
   weights: 0
   weights: 0
-  weights: 1.1953
-  weights: 0.32264
-  weights: 39.23445
+  weights: 1.06434
+  weights: 0.69725
+  weights: 26.93658
   weights: 0
   weights: 0
-  weights: 60.58196
+  weights: 61.77022
   weights: 0
   weights: 0
   weights: 0
@@ -344,8 +344,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestExodin-Phase7-Lvl60-StatWeights-Default"
  value: {
-  weights: 3.14358
-  weights: 1.13516
+  weights: 3.09414
+  weights: 1.02758
   weights: 0
   weights: 0
   weights: 0
@@ -357,13 +357,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 25.3099
-  weights: 3.44723
+  weights: 25.19397
+  weights: 3.50879
   weights: 0
   weights: 0
-  weights: 1.12957
+  weights: 1.1118
   weights: 0
-  weights: 32.65095
+  weights: 30.5996
   weights: 0
   weights: 0
   weights: 0
@@ -433,260 +433,260 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3122.66634
-  tps: 2461.7858
+  dps: 2810.99809
+  tps: 2221.84464
   hps: 79.3929
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5310.39957
-  tps: 5204.15663
+  dps: 5004.17684
+  tps: 4964.77575
   hps: 78.83843
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3038.09793
-  tps: 2397.0597
+  dps: 2731.31125
+  tps: 2160.88305
   hps: 78.83843
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3158.00707
-  tps: 2494.44108
+  dps: 2842.94544
+  tps: 2251.90074
   hps: 79.10683
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2335.13076
-  tps: 2582.81747
+  dps: 2100.76924
+  tps: 2342.88894
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1285.29607
-  tps: 1028.32074
+  dps: 1132.3054
+  tps: 907.43522
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1414.64492
-  tps: 1132.20039
+  dps: 1278.45544
+  tps: 1027.39306
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Human-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5387.19501
-  tps: 5258.4771
+  dps: 5072.81273
+  tps: 5012.89984
   hps: 80.38173
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Human-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3152.40654
-  tps: 2484.02876
+  dps: 2836.56965
+  tps: 2240.86739
   hps: 80.38173
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Human-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3272.01328
-  tps: 2582.58417
+  dps: 2948.05888
+  tps: 2333.08537
   hps: 80.75383
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Human-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2448.48284
-  tps: 2695.66174
+  dps: 2188.64269
+  tps: 2426.49432
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Human-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1365.63176
-  tps: 1090.98835
+  dps: 1194.0698
+  tps: 955.15309
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Human-p4-exodin-6pcT1-P4 Exodin-p4-exodin-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1493.80525
-  tps: 1194.03944
+  dps: 1353.60192
+  tps: 1085.51803
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2598.25661
-  tps: 2056.8316
+  dps: 2364.13827
+  tps: 1876.5314
   hps: 61.69947
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 1769.82471
-  tps: 1419.99074
+  dps: 1757.91055
+  tps: 1410.826
   hps: 50.91467
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 1769.84179
-  tps: 1420.88124
+  dps: 1757.86023
+  tps: 1411.66465
   hps: 50.91467
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 1897.32815
-  tps: 1523.00951
+  dps: 1884.5054
+  tps: 1513.14585
   hps: 50.91467
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 2372.4602
-  tps: 1890.0315
+  dps: 2305.00899
+  tps: 1838.14595
   hps: 57.8463
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1581.09563
-  tps: 1264.39428
+  dps: 1572.19854
+  tps: 1257.55037
   hps: 50.01187
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4467.35131
-  tps: 3507.04012
+  dps: 3974.96935
+  tps: 3128.13056
   hps: 85.16279
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 8061.58671
-  tps: 7524.57114
+  dps: 7566.44132
+  tps: 7140.56665
   hps: 84.8571
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 4322.8152
-  tps: 3395.52582
+  dps: 3841.79794
+  tps: 3025.3588
   hps: 84.0458
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4488.55234
-  tps: 3529.83502
+  dps: 3992.53171
+  tps: 3148.0906
   hps: 85.92867
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 3452.76072
-  tps: 3574.42486
+  dps: 3048.13736
+  tps: 3193.79491
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1826.252
-  tps: 1449.80576
+  dps: 1568.72961
+  tps: 1247.95943
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 1929.62028
-  tps: 1531.48883
+  dps: 1724.27315
+  tps: 1374.82491
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Human-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 8149.07343
-  tps: 7586.38863
+  dps: 7646.03444
+  tps: 7196.43731
   hps: 86.27027
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Human-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 4471.73023
-  tps: 3508.24488
+  dps: 3977.72598
+  tps: 3128.09168
   hps: 86.06693
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Human-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4651.22204
-  tps: 3653.89763
+  dps: 4139.97147
+  tps: 3260.33817
   hps: 88.15517
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Human-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 3627.43745
-  tps: 3728.1918
+  dps: 3171.29741
+  tps: 3304.35901
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Human-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1934.9274
-  tps: 1534.48104
+  dps: 1666.07976
+  tps: 1323.56993
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Human-p5-exodin-P5 Exodin-p5-exodin-6CF-2DR-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2015.31975
-  tps: 1599.60797
+  dps: 1802.0298
+  tps: 1431.68802
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3709.33884
-  tps: 2922.92976
+  dps: 3310.75815
+  tps: 2616.13535
   hps: 68.23663
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 2640.23283
-  tps: 2184.08253
+  dps: 2602.55868
+  tps: 2155.10241
   dtps: 4.44628
   hps: 55.03013
  }
@@ -694,8 +694,8 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 2641.05593
-  tps: 2185.77076
+  dps: 2603.36595
+  tps: 2156.77846
   dtps: 4.52577
   hps: 55.03013
  }
@@ -703,8 +703,8 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 2803.80708
-  tps: 2318.51392
+  dps: 2764.02975
+  tps: 2287.91598
   dtps: 4.44628
   hps: 55.03013
  }
@@ -712,8 +712,8 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 3535.90785
-  tps: 2897.939
+  dps: 3458.05359
+  tps: 2838.0511
   dtps: 2.61861
   hps: 60.0606
  }
@@ -721,8 +721,8 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 2336.43769
-  tps: 1911.78678
+  dps: 2322.43904
+  tps: 1901.01859
   dtps: 2.44338
   hps: 55.2538
  }
@@ -730,266 +730,266 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Average-Default"
  value: {
-  dps: 5792.77643
-  tps: 4661.40552
-  dtps: 3.43446
-  hps: 70.21249
+  dps: 5204.98408
+  tps: 4187.24582
+  dtps: 3.41311
+  hps: 64.85451
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Settings-Dwarf-p6-exodin-P6 Exodin-p6-exodin-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 10374.80868
-  tps: 9656.74916
-  dtps: 2.12659
-  hps: 71.55707
+  dps: 9836.82388
+  tps: 9093.46705
+  dtps: 2.26681
+  hps: 66.1789
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Settings-Dwarf-p6-exodin-P6 Exodin-p6-exodin-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 5817.42673
-  tps: 4674.54046
-  dtps: 2.79791
-  hps: 71.2175
+  dps: 5222.69761
+  tps: 4196.69802
+  dtps: 2.61861
+  hps: 65.96133
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Settings-Dwarf-p6-exodin-P6 Exodin-p6-exodin-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 6158.74863
-  tps: 4950.55262
+  dps: 5532.46874
+  tps: 4444.97335
   dtps: 13.09305
-  hps: 75.50783
+  hps: 69.61117
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Settings-Dwarf-p6-exodin-P6 Exodin-p6-exodin-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 4841.10631
-  tps: 4950.9442
-  dtps: 2.32437
+  dps: 4831.72501
+  tps: 4889.39235
+  dtps: 2.14153
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Settings-Dwarf-p6-exodin-P6 Exodin-p6-exodin-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2489.3601
-  tps: 2022.40138
-  dtps: 2.6123
+  dps: 2269.38924
+  tps: 1844.32584
+  dtps: 2.74534
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Settings-Dwarf-p6-exodin-P6 Exodin-p6-exodin-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2690.0655
-  tps: 2182.33583
+  dps: 2462.22828
+  tps: 2000.42371
   dtps: 12.10092
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Settings-Human-p6-exodin-P6 Exodin-p6-exodin-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 10399.54736
-  tps: 9680.10844
-  dtps: 2.12659
-  hps: 71.5225
+  dps: 9842.31872
+  tps: 9096.49728
+  dtps: 2.36781
+  hps: 66.2216
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Settings-Human-p6-exodin-P6 Exodin-p6-exodin-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 5819.14773
-  tps: 4675.99373
-  dtps: 2.79791
-  hps: 71.0711
+  dps: 5218.13465
+  tps: 4193.21109
+  dtps: 2.61861
+  hps: 65.8312
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Settings-Human-p6-exodin-P6 Exodin-p6-exodin-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 6166.29844
-  tps: 4955.31382
+  dps: 5548.79115
+  tps: 4457.75202
   dtps: 13.09305
-  hps: 75.457
+  hps: 69.662
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Settings-Human-p6-exodin-P6 Exodin-p6-exodin-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 4838.49815
-  tps: 4952.75608
-  dtps: 2.34134
+  dps: 4834.42054
+  tps: 4896.61497
+  dtps: 2.14153
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Settings-Human-p6-exodin-P6 Exodin-p6-exodin-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2479.86107
-  tps: 2015.07372
-  dtps: 2.72551
+  dps: 2272.71495
+  tps: 1847.81341
+  dtps: 2.42018
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-Settings-Human-p6-exodin-P6 Exodin-p6-exodin-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2696.36596
-  tps: 2187.70351
+  dps: 2459.63723
+  tps: 1999.31179
   dtps: 12.10092
  }
 }
 dps_results: {
  key: "TestExodin-Phase6-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 5098.4662
-  tps: 4106.75122
-  dtps: 2.71769
-  hps: 59.90403
+  dps: 4546.43354
+  tps: 3663.72201
+  dtps: 2.75997
+  hps: 54.5279
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 2640.75154
-  tps: 2111.51876
+  dps: 2636.79279
+  tps: 2108.47357
   hps: 60.6157
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 2641.00456
-  tps: 2112.41245
+  dps: 2637.04581
+  tps: 2109.36727
   hps: 60.6157
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 2792.27788
-  tps: 2232.65338
+  dps: 2788.11908
+  tps: 2229.4543
   hps: 60.6157
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 3996.61528
-  tps: 3164.49376
+  dps: 3963.02753
+  tps: 3138.65703
   hps: 68.2651
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 2282.43376
-  tps: 1810.49032
+  dps: 2278.217
+  tps: 1807.24667
   hps: 56.91097
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Average-Default"
  value: {
-  dps: 5876.99329
-  tps: 4588.35978
+  dps: 5798.79872
+  tps: 4528.21011
   hps: 72.63566
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Settings-Dwarf-p7-exodin-naxx-P7 Exodin-p7-exodin-FullBuffs-P7-Consumes-Exodin-LongMultiTarget"
  value: {
-  dps: 11300.32465
-  tps: 9929.21433
+  dps: 11143.2782
+  tps: 9808.40937
   hps: 72.9804
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Settings-Dwarf-p7-exodin-naxx-P7 Exodin-p7-exodin-FullBuffs-P7-Consumes-Exodin-LongSingleTarget"
  value: {
-  dps: 5853.61513
-  tps: 4570.74525
+  dps: 5776.93568
+  tps: 4511.76106
   hps: 72.6571
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Settings-Dwarf-p7-exodin-naxx-P7 Exodin-p7-exodin-FullBuffs-P7-Consumes-Exodin-ShortSingleTarget"
  value: {
-  dps: 6320.13922
-  tps: 4938.89116
+  dps: 6241.30275
+  tps: 4878.24772
   hps: 78.3545
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Settings-Dwarf-p7-exodin-naxx-P7 Exodin-p7-exodin-NoBuffs-P7-Consumes-Exodin-LongMultiTarget"
  value: {
-  dps: 6248.93286
-  tps: 5810.35569
+  dps: 6201.02914
+  tps: 5773.50668
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Settings-Dwarf-p7-exodin-naxx-P7 Exodin-p7-exodin-NoBuffs-P7-Consumes-Exodin-LongSingleTarget"
  value: {
-  dps: 2671.01548
-  tps: 2104.62783
+  dps: 2646.67291
+  tps: 2085.90277
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Settings-Dwarf-p7-exodin-naxx-P7 Exodin-p7-exodin-NoBuffs-P7-Consumes-Exodin-ShortSingleTarget"
  value: {
-  dps: 2814.88636
-  tps: 2217.28288
+  dps: 2792.72469
+  tps: 2200.23543
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Settings-Human-p7-exodin-naxx-P7 Exodin-p7-exodin-FullBuffs-P7-Consumes-Exodin-LongMultiTarget"
  value: {
-  dps: 11281.68204
-  tps: 9914.21769
+  dps: 11125.08361
+  tps: 9793.75736
   hps: 73.01293
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Settings-Human-p7-exodin-naxx-P7 Exodin-p7-exodin-FullBuffs-P7-Consumes-Exodin-LongSingleTarget"
  value: {
-  dps: 5849.99936
-  tps: 4567.77763
+  dps: 5770.90518
+  tps: 4506.93596
   hps: 72.6815
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Settings-Human-p7-exodin-naxx-P7 Exodin-p7-exodin-FullBuffs-P7-Consumes-Exodin-ShortSingleTarget"
  value: {
-  dps: 6314.9845
-  tps: 4934.70674
+  dps: 6237.06301
+  tps: 4874.76713
   hps: 78.30367
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Settings-Human-p7-exodin-naxx-P7 Exodin-p7-exodin-NoBuffs-P7-Consumes-Exodin-LongMultiTarget"
  value: {
-  dps: 6269.62732
-  tps: 5833.43029
+  dps: 6220.35233
+  tps: 5795.52645
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Settings-Human-p7-exodin-naxx-P7 Exodin-p7-exodin-NoBuffs-P7-Consumes-Exodin-LongSingleTarget"
  value: {
-  dps: 2667.76618
-  tps: 2102.20287
+  dps: 2643.04165
+  tps: 2083.18401
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-Settings-Human-p7-exodin-naxx-P7 Exodin-p7-exodin-NoBuffs-P7-Consumes-Exodin-ShortSingleTarget"
  value: {
-  dps: 2816.95145
-  tps: 2218.93542
+  dps: 2794.04906
+  tps: 2201.3182
  }
 }
 dps_results: {
  key: "TestExodin-Phase7-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 5300.35384
-  tps: 4142.90309
+  dps: 5226.1242
+  tps: 4085.80336
   hps: 64.08253
  }
 }
diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results
index f4377baec9..23a76fb3c5 100644
--- a/sim/paladin/retribution/TestRetribution.results
+++ b/sim/paladin/retribution/TestRetribution.results
@@ -491,12 +491,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestRetribution-Phase4-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.53097
-  weights: 2.0433
+  weights: 2.26527
+  weights: 1.71826
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.40305
+  weights: 0.37275
   weights: 0
   weights: 0
   weights: 0
@@ -504,16 +504,16 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 6.85496
+  weights: 7.11805
   weights: 0.70363
   weights: 0
   weights: 0
-  weights: 0.90944
-  weights: 1.52893
-  weights: 28.75372
+  weights: 0.81397
+  weights: 1.61831
+  weights: 23.67287
   weights: 0
   weights: 0
-  weights: 53.06601
+  weights: 44.38271
   weights: 0
   weights: 0
   weights: 0
@@ -540,12 +540,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestRetribution-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 3.96126
-  weights: 3.61741
+  weights: 3.09021
+  weights: 2.3209
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.70864
+  weights: 0.43974
   weights: 0
   weights: 0
   weights: 0
@@ -553,16 +553,16 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 12.66892
-  weights: 0.51759
+  weights: 8.27701
+  weights: 0.41442
   weights: 0
   weights: 0
-  weights: 1.40355
-  weights: 2.92767
-  weights: 52.55723
+  weights: 1.06024
+  weights: 3.73363
+  weights: 33.27234
   weights: 0
   weights: 0
-  weights: 71.17683
+  weights: 61.60216
   weights: 0
   weights: 0
   weights: 0
@@ -589,12 +589,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestRetribution-Phase6-Lvl60-StatWeights-Default"
  value: {
-  weights: 4.17638
-  weights: 3.71857
+  weights: 3.19977
+  weights: 2.11661
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.68586
+  weights: 0.43831
   weights: 0
   weights: 0
   weights: 0
@@ -602,13 +602,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 8.95174
-  weights: 0.56046
+  weights: 6.91478
+  weights: 0.46962
   weights: 0
   weights: 0
-  weights: 1.50618
-  weights: 4.58384
-  weights: 59.69102
+  weights: 1.15548
+  weights: 3.90577
+  weights: 39.17817
   weights: 0
   weights: 0
   weights: 0
@@ -638,12 +638,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestRetribution-Phase7-Lvl60-StatWeights-Default"
  value: {
-  weights: 5.09541
-  weights: 4.54495
+  weights: 3.94384
+  weights: 3.41395
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.73666
+  weights: 0.44644
   weights: 0
   weights: 0
   weights: 0
@@ -651,13 +651,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 21.41467
-  weights: 0.74991
+  weights: 9.26605
+  weights: 0.46322
   weights: 0
   weights: 0
-  weights: 1.83091
+  weights: 1.41712
   weights: 0
-  weights: 70.488
+  weights: 45.59107
   weights: 0
   weights: 0
   weights: 0
@@ -1020,930 +1020,930 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 1740.49291
-  tps: 1394.67287
+  dps: 1708.44143
+  tps: 1370.01788
   hps: 26.27067
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 1715.80181
-  tps: 1375.07152
+  dps: 1683.90547
+  tps: 1350.53588
   hps: 25.8335
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 1837.07065
-  tps: 1471.56343
+  dps: 1802.53502
+  tps: 1444.99756
   hps: 26.05717
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 2318.34975
-  tps: 1857.02897
+  dps: 2259.86638
+  tps: 1812.04176
   hps: 31.31333
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1595.84178
-  tps: 1275.14269
+  dps: 1566.69301
+  tps: 1252.72056
   hps: 25.22147
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3661.81173
-  tps: 2897.33778
-  hps: 48.69505
+  dps: 3298.2809
+  tps: 2616.79059
+  hps: 48.70084
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist Stopattack-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4622.47888
-  tps: 4692.90156
+  dps: 4489.4962
+  tps: 4590.6072
   hps: 33.38327
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist Stopattack-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2447.96835
-  tps: 1946.38837
+  dps: 2369.36725
+  tps: 1885.92598
   hps: 31.63663
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist Stopattack-p4-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2536.33532
-  tps: 2012.2424
+  dps: 2459.17106
+  tps: 1952.88528
   hps: 32.27917
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist Stopattack-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1721.40764
-  tps: 1997.50242
+  dps: 1695.75224
+  tps: 1977.7675
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist Stopattack-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 887.15976
-  tps: 717.63767
+  dps: 869.69541
+  tps: 704.20355
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist Stopattack-p4-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1044.19387
-  tps: 845.08165
+  dps: 1026.97835
+  tps: 831.83894
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist Stopattack-p5p6p7-twist-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5605.22984
-  tps: 5445.29595
+  dps: 5450.20187
+  tps: 5326.04367
   hps: 45.8964
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist Stopattack-p5p6p7-twist-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3243.19806
-  tps: 2558.17711
+  dps: 3146.47517
+  tps: 2483.77489
   hps: 44.36937
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist Stopattack-p5p6p7-twist-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3390.71766
-  tps: 2671.82357
+  dps: 3293.3089
+  tps: 2596.89375
   hps: 44.408
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist Stopattack-p5p6p7-twist-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1932.93824
-  tps: 2226.68855
+  dps: 1903.35075
+  tps: 2203.92895
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist Stopattack-p5p6p7-twist-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1145.2102
-  tps: 919.69222
+  dps: 1127.42841
+  tps: 906.01392
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist Stopattack-p5p6p7-twist-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1254.67739
-  tps: 1004.28233
+  dps: 1238.89836
+  tps: 992.14461
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4825.43367
-  tps: 4858.83711
+  dps: 4684.23944
+  tps: 4750.22616
   hps: 31.82777
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2437.13526
-  tps: 1937.58544
+  dps: 2361.00544
+  tps: 1879.02404
   hps: 30.61387
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2512.25856
-  tps: 1991.95787
+  dps: 2438.13514
+  tps: 1934.93986
   hps: 31.83183
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1826.58055
-  tps: 2065.8243
+  dps: 1800.24184
+  tps: 2045.56375
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 916.9849
-  tps: 740.25145
+  dps: 900.5116
+  tps: 727.57967
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 969.75475
-  tps: 784.74276
+  dps: 954.76574
+  tps: 773.21275
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p5p6p7-twist-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5311.95542
-  tps: 5172.38515
+  dps: 5163.4044
+  tps: 5058.11514
   hps: 42.09813
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p5p6p7-twist-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3105.00807
-  tps: 2450.47672
+  dps: 3012.37933
+  tps: 2379.22384
   hps: 41.80737
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p5p6p7-twist-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3186.28922
-  tps: 2511.68341
+  dps: 3094.32385
+  tps: 2440.94082
   hps: 41.16483
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p5p6p7-twist-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1894.58605
-  tps: 2166.03632
+  dps: 1865.09512
+  tps: 2143.35098
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p5p6p7-twist-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1126.76819
-  tps: 905.13034
+  dps: 1107.19118
+  tps: 890.0711
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twist-P4 Twist-p5p6p7-twist-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1184.40707
-  tps: 951.78257
+  dps: 1168.44234
+  tps: 939.50201
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist Stopattack-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 6846.98926
-  tps: 6616.01676
+  dps: 6424.56861
+  tps: 6269.30697
   hps: 51.19527
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist Stopattack-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3553.70089
-  tps: 2810.36917
-  hps: 49.2148
+  dps: 3199.95891
+  tps: 2537.2419
+  hps: 49.22497
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist Stopattack-p4-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3544.0448
-  tps: 2803.09714
+  dps: 3211.7794
+  tps: 2546.7973
   hps: 49.17617
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist Stopattack-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2569.01849
-  tps: 2769.38739
+  dps: 2203.17425
+  tps: 2404.11057
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist Stopattack-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1261.08726
-  tps: 1012.72877
+  dps: 1066.48555
+  tps: 857.96678
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist Stopattack-p4-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1487.41188
-  tps: 1195.66213
+  dps: 1349.92226
+  tps: 1086.53472
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist Stopattack-p5p6p7-twist-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 452.7557
-  tps: 541.7039
-  hps: 3.02967
+  dps: 417.01702
+  tps: 499.34183
+  hps: 2.8975
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist Stopattack-p5p6p7-twist-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 317.02096
-  tps: 254.60906
-  hps: 3.02967
+  dps: 288.54999
+  tps: 231.90396
+  hps: 2.8975
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist Stopattack-p5p6p7-twist-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 541.99212
-  tps: 428.8145
+  dps: 507.44352
+  tps: 401.93812
   hps: 6.35417
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist Stopattack-p5p6p7-twist-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 140.46774
-  tps: 206.28302
+  dps: 137.69478
+  tps: 202.38458
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist Stopattack-p5p6p7-twist-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 102.05816
-  tps: 83.72114
+  dps: 97.14405
+  tps: 79.87052
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist Stopattack-p5p6p7-twist-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 249.42124
-  tps: 196.93403
+  dps: 235.27695
+  tps: 185.67253
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 7372.50871
-  tps: 7081.7032
-  hps: 50.10133
+  dps: 6928.07723
+  tps: 6716.55082
+  hps: 50.081
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3601.46333
-  tps: 2850.2934
+  dps: 3238.61286
+  tps: 2570.23992
   hps: 49.0013
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3717.14516
-  tps: 2939.01525
+  dps: 3358.75805
+  tps: 2662.51423
   hps: 50.73167
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2639.01845
-  tps: 2844.09361
+  dps: 2346.08526
+  tps: 2528.54626
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1275.66426
-  tps: 1024.78314
+  dps: 1108.53891
+  tps: 891.76901
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1485.77634
-  tps: 1195.35224
+  dps: 1335.34254
+  tps: 1075.75867
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p5p6p7-twist-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3659.76613
-  tps: 3408.85908
-  hps: 20.67087
+  dps: 3544.84653
+  tps: 3311.0063
+  hps: 20.71153
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p5p6p7-twist-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1763.05808
-  tps: 1388.75561
-  hps: 19.6847
+  dps: 1710.40808
+  tps: 1347.95381
+  hps: 19.78637
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p5p6p7-twist-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1938.00141
-  tps: 1524.19073
+  dps: 1864.22293
+  tps: 1467.12269
   hps: 21.594
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p5p6p7-twist-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1288.08955
-  tps: 1323.42817
+  dps: 1260.99042
+  tps: 1295.68687
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p5p6p7-twist-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 649.95065
-  tps: 517.98057
+  dps: 635.43805
+  tps: 506.58337
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4-twisting-6pcT1-P4 Twist-p5p6p7-twist-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 723.15307
-  tps: 573.06685
+  dps: 702.30025
+  tps: 556.71807
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist Stopattack-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4944.94768
-  tps: 4966.35691
+  dps: 4803.23617
+  tps: 4857.34805
   hps: 35.44913
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist Stopattack-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2621.06054
-  tps: 2079.95546
+  dps: 2541.56839
+  tps: 2018.80765
   hps: 33.75537
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist Stopattack-p4-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2732.1881
-  tps: 2164.23286
+  dps: 2648.07113
+  tps: 2099.5275
   hps: 34.47517
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist Stopattack-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1865.39813
-  tps: 2133.99446
+  dps: 1835.76126
+  tps: 2111.19687
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist Stopattack-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 972.36893
-  tps: 784.73509
+  dps: 954.43039
+  tps: 770.93621
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist Stopattack-p4-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1138.37489
-  tps: 919.02827
+  dps: 1120.50644
+  tps: 905.2833
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist Stopattack-p5p6p7-twist-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5892.82752
-  tps: 5676.83029
+  dps: 5731.35471
+  tps: 5552.62043
   hps: 49.2453
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist Stopattack-p5p6p7-twist-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3521.95002
-  tps: 2775.63735
+  dps: 3419.52107
+  tps: 2696.84585
   hps: 47.74063
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist Stopattack-p5p6p7-twist-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3638.46128
-  tps: 2863.80995
+  dps: 3538.9316
+  tps: 2787.24866
   hps: 47.90533
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist Stopattack-p5p6p7-twist-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2085.75199
-  tps: 2368.22016
+  dps: 2054.35199
+  tps: 2344.06632
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist Stopattack-p5p6p7-twist-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1246.51691
-  tps: 999.02131
+  dps: 1226.57983
+  tps: 983.6851
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist Stopattack-p5p6p7-twist-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1360.31619
-  tps: 1088.11218
+  dps: 1341.46361
+  tps: 1073.61019
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5094.40539
-  tps: 5077.81336
+  dps: 4949.35301
+  tps: 4966.23462
   hps: 33.86313
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2611.14317
-  tps: 2073.2465
+  dps: 2532.51127
+  tps: 2012.76042
   hps: 32.78343
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2718.98144
-  tps: 2153.27643
+  dps: 2645.12684
+  tps: 2096.4652
   hps: 34.35317
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1927.73847
-  tps: 2150.98121
+  dps: 1899.30299
+  tps: 2129.10777
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 996.05214
-  tps: 802.42188
+  dps: 977.97843
+  tps: 788.51902
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1070.40316
-  tps: 864.20706
+  dps: 1052.7211
+  tps: 850.60548
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p5p6p7-twist-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 5622.08907
-  tps: 5432.52549
+  dps: 5466.0626
+  tps: 5312.50512
   hps: 45.09527
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p5p6p7-twist-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3353.50516
-  tps: 2643.61389
+  dps: 3257.13072
+  tps: 2569.4797
   hps: 45.00377
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p5p6p7-twist-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3473.00296
-  tps: 2734.64849
+  dps: 3382.28809
+  tps: 2664.86782
   hps: 44.91633
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p5p6p7-twist-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2042.16593
-  tps: 2305.3058
+  dps: 2009.13
+  tps: 2279.89354
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p5p6p7-twist-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1235.65671
-  tps: 990.39595
+  dps: 1215.07848
+  tps: 974.56654
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twist-P4 Twist-p5p6p7-twist-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1286.21746
-  tps: 1029.89672
+  dps: 1267.6363
+  tps: 1015.60352
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist Stopattack-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 7027.936
-  tps: 6767.32534
+  dps: 6596.51509
+  tps: 6413.87895
   hps: 51.82967
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist Stopattack-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3631.35402
-  tps: 2870.797
+  dps: 3279.92074
+  tps: 2599.41016
   hps: 49.6174
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist Stopattack-p4-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3622.03166
-  tps: 2863.02875
+  dps: 3289.42486
+  tps: 2606.47757
   hps: 49.4405
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist Stopattack-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2647.91512
-  tps: 2842.95879
+  dps: 2254.82378
+  tps: 2454.91445
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist Stopattack-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1290.6362
-  tps: 1035.40584
+  dps: 1115.60508
+  tps: 896.29668
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist Stopattack-p4-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1527.54017
-  tps: 1226.59547
+  dps: 1384.2118
+  tps: 1112.72226
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist Stopattack-p5p6p7-twist-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 460.8643
-  tps: 549.78967
-  hps: 3.13133
+  dps: 418.54294
+  tps: 498.39515
+  hps: 2.867
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist Stopattack-p5p6p7-twist-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 326.08963
-  tps: 261.68021
-  hps: 3.13133
+  dps: 290.46406
+  tps: 233.22967
+  hps: 2.867
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist Stopattack-p5p6p7-twist-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 553.38569
-  tps: 437.4978
+  dps: 518.40503
+  tps: 410.3018
   hps: 6.405
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist Stopattack-p5p6p7-twist-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 141.45639
-  tps: 206.0299
+  dps: 138.8522
+  tps: 202.6511
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist Stopattack-p5p6p7-twist-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 102.33732
-  tps: 83.87034
+  dps: 99.99792
+  tps: 82.02101
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist Stopattack-p5p6p7-twist-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 254.9766
-  tps: 201.14631
+  dps: 240.62984
+  tps: 189.73588
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 7499.26039
-  tps: 7194.07647
+  dps: 7055.28313
+  tps: 6832.02243
   hps: 50.28433
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3701.60915
-  tps: 2927.04501
+  dps: 3331.4763
+  tps: 2641.36206
   hps: 49.39373
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3824.29587
-  tps: 3020.89985
+  dps: 3458.71386
+  tps: 2738.81409
   hps: 51.00617
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2720.66776
-  tps: 2912.6503
+  dps: 2389.91065
+  tps: 2567.21636
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1298.53042
-  tps: 1042.00929
+  dps: 1146.7843
+  tps: 921.60113
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p4-twisting-6pcT1-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1537.96435
-  tps: 1236.29562
+  dps: 1384.31009
+  tps: 1114.05812
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p5p6p7-twist-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3741.21066
-  tps: 3472.99687
-  hps: 20.8437
+  dps: 3621.93773
+  tps: 3371.63654
+  hps: 20.86403
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p5p6p7-twist-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1833.61144
-  tps: 1443.28745
-  hps: 19.75383
+  dps: 1778.5506
+  tps: 1400.45893
+  hps: 19.83517
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p5p6p7-twist-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2019.98449
-  tps: 1587.60342
+  dps: 1945.01215
+  tps: 1529.5789
   hps: 21.899
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p5p6p7-twist-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1319.42643
-  tps: 1346.74537
+  dps: 1292.89909
+  tps: 1320.15623
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p5p6p7-twist-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 676.27403
-  tps: 538.2566
+  dps: 661.41357
+  tps: 526.57779
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4-twisting-6pcT1-P4 Twist-p5p6p7-twist-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 753.2225
-  tps: 596.27333
+  dps: 732.16873
+  tps: 579.798
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2970.98331
-  tps: 2360.45912
-  hps: 37.4296
+  dps: 2706.03067
+  tps: 2155.45622
+  hps: 37.41943
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 2502.48062
-  tps: 1966.67594
+  dps: 2377.8164
+  tps: 1870.78039
   hps: 44.18433
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 2502.48062
-  tps: 1966.96894
+  dps: 2377.8164
+  tps: 1871.07338
   hps: 44.18433
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 2667.48183
-  tps: 2096.7777
+  dps: 2533.49405
+  tps: 1993.71017
   hps: 44.18433
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 4432.1106
-  tps: 3466.70593
-  hps: 60.3229
+  dps: 3106.25409
+  tps: 2438.10309
+  hps: 48.72883
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 2075.54926
-  tps: 1625.73852
+  dps: 2034.85976
+  tps: 1594.43891
   hps: 40.2844
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 6072.62456
-  tps: 4747.80458
-  hps: 67.50553
+  dps: 4467.32443
+  tps: 3504.23813
+  hps: 56.27925
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5-twisting-P5 Twist-p5p6p7-twist-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 9032.79069
-  tps: 8426.61918
-  hps: 67.7649
+  dps: 7216.75763
+  tps: 6874.82255
+  hps: 57.25257
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5-twisting-P5 Twist-p5p6p7-twist-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 5932.46785
-  tps: 4638.97816
-  hps: 67.15897
+  dps: 4375.70862
+  tps: 3431.74221
+  hps: 55.94717
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5-twisting-P5 Twist-p5p6p7-twist-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 6333.80487
-  tps: 4953.1829
-  hps: 71.004
+  dps: 4707.01786
+  tps: 3693.11454
+  hps: 59.64783
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5-twisting-P5 Twist-p5p6p7-twist-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 2980.1519
-  tps: 3169.13344
+  dps: 2498.86468
+  tps: 2737.06141
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5-twisting-P5 Twist-p5p6p7-twist-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1912.31553
-  tps: 1513.18224
+  dps: 1481.01671
+  tps: 1177.84602
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5-twisting-P5 Twist-p5p6p7-twist-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2038.65858
-  tps: 1610.80052
+  dps: 1643.00786
+  tps: 1302.80833
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5-twisting-P5 Twist-p5p6p7-twist-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 9260.0858
-  tps: 8613.4659
-  hps: 69.47697
+  dps: 7344.30674
+  tps: 6974.3647
+  hps: 58.48477
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5-twisting-P5 Twist-p5p6p7-twist-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 6175.74813
-  tps: 4828.14536
-  hps: 68.76123
+  dps: 4550.78931
+  tps: 3567.74809
+  hps: 57.11633
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5-twisting-P5 Twist-p5p6p7-twist-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 6525.39237
-  tps: 5100.96849
-  hps: 72.346
+  dps: 4881.35545
+  tps: 3828.30011
+  hps: 60.89833
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5-twisting-P5 Twist-p5p6p7-twist-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 3131.25013
-  tps: 3312.24203
+  dps: 2630.33399
+  tps: 2861.81953
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5-twisting-P5 Twist-p5p6p7-twist-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 2019.29998
-  tps: 1596.12755
+  dps: 1579.17138
+  tps: 1254.63038
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5-twisting-P5 Twist-p5p6p7-twist-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2225.81509
-  tps: 1755.99549
+  dps: 1735.20469
+  tps: 1375.028
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 5150.40266
-  tps: 4033.5384
-  hps: 55.86787
+  dps: 3621.79706
+  tps: 2848.47797
+  hps: 44.95293
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 2564.07271
-  tps: 2013.57879
+  dps: 2515.04733
+  tps: 1975.86696
   dtps: 2.58147
   hps: 42.62883
  }
@@ -1951,8 +1951,8 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 2564.38436
-  tps: 2014.199
+  dps: 2515.35899
+  tps: 1976.48717
   dtps: 2.6246
   hps: 42.62883
  }
@@ -1960,8 +1960,8 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 2714.42834
-  tps: 2132.42498
+  dps: 2661.96088
+  tps: 2092.06539
   dtps: 2.58147
   hps: 42.62883
  }
@@ -1969,8 +1969,8 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 3447.56201
-  tps: 2699.76907
+  dps: 3286.20736
+  tps: 2575.65011
   dtps: 2.72437
   hps: 47.33803
  }
@@ -1978,8 +1978,8 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 2419.97261
-  tps: 1889.24452
+  dps: 2377.93119
+  tps: 1856.90497
   dtps: 2.44519
   hps: 42.33807
  }
@@ -1987,266 +1987,266 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Average-Default"
  value: {
-  dps: 6764.25121
-  tps: 5280.72515
-  dtps: 2.93194
-  hps: 71.65663
+  dps: 5217.07889
+  tps: 4083.14167
+  dtps: 2.94685
+  hps: 60.73262
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Settings-Dwarf-p6-twisting-P6 Twist-p5p6p7-twist-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 9930.38655
-  tps: 9124.1264
+  dps: 8183.96969
+  tps: 7638.7685
   dtps: 2.85677
-  hps: 73.0475
+  hps: 62.50467
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Settings-Dwarf-p6-twisting-P6 Twist-p5p6p7-twist-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 6801.1473
-  tps: 5308.54253
+  dps: 5231.9727
+  tps: 4093.17145
   dtps: 2.84154
-  hps: 71.9556
+  hps: 61.05897
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Settings-Dwarf-p6-twisting-P6 Twist-p5p6p7-twist-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 7314.89575
-  tps: 5706.34001
+  dps: 5637.74968
+  tps: 4410.60927
   dtps: 14.20768
-  hps: 75.44683
+  hps: 62.96217
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Settings-Dwarf-p6-twisting-P6 Twist-p5p6p7-twist-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 3822.00905
-  tps: 3920.9352
+  dps: 3153.5268
+  tps: 3282.30931
   dtps: 2.60688
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Settings-Dwarf-p6-twisting-P6 Twist-p5p6p7-twist-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2632.41904
-  tps: 2073.48573
+  dps: 2057.77751
+  tps: 1625.37069
   dtps: 2.54095
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Settings-Dwarf-p6-twisting-P6 Twist-p5p6p7-twist-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2925.43885
-  tps: 2308.38406
+  dps: 2353.14342
+  tps: 1865.00916
   dtps: 12.70473
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Settings-Human-p6-twisting-P6 Twist-p5p6p7-twist-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 9938.82084
-  tps: 9130.30386
+  dps: 8183.3389
+  tps: 7637.79901
   dtps: 2.85677
-  hps: 73.0475
+  hps: 62.50467
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Settings-Human-p6-twisting-P6 Twist-p5p6p7-twist-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 6804.06621
-  tps: 5310.74621
+  dps: 5233.55983
+  tps: 4094.51335
   dtps: 2.84154
-  hps: 71.9556
+  hps: 61.0488
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Settings-Human-p6-twisting-P6 Twist-p5p6p7-twist-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 7317.70561
-  tps: 5708.45673
+  dps: 5638.272
+  tps: 4410.96426
   dtps: 14.20768
-  hps: 75.44683
+  hps: 62.96217
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Settings-Human-p6-twisting-P6 Twist-p5p6p7-twist-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 3828.6006
-  tps: 3938.13012
+  dps: 3163.51162
+  tps: 3303.05364
   dtps: 2.60688
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Settings-Human-p6-twisting-P6 Twist-p5p6p7-twist-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2637.90621
-  tps: 2077.76863
+  dps: 2076.0135
+  tps: 1640.8205
   dtps: 2.54095
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-Settings-Human-p6-twisting-P6 Twist-p5p6p7-twist-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2927.31052
-  tps: 2309.80909
+  dps: 2354.92459
+  tps: 1866.36364
   dtps: 12.70473
  }
 }
 dps_results: {
  key: "TestRetribution-Phase6-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6257.10104
-  tps: 4886.66136
+  dps: 4737.7654
+  tps: 3710.29003
   dtps: 2.71732
-  hps: 64.64983
+  hps: 53.8813
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 2881.76246
-  tps: 2257.8324
+  dps: 2820.16015
+  tps: 2210.44601
   hps: 45.72967
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 2881.76246
-  tps: 2258.15716
+  dps: 2820.16015
+  tps: 2210.77077
   hps: 45.72967
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 3048.10749
-  tps: 2389.03029
+  dps: 2982.37813
+  tps: 2338.46924
   hps: 45.72967
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 4496.42108
-  tps: 3514.07848
-  hps: 58.93007
+  dps: 3624.63282
+  tps: 2835.9125
+  hps: 51.5023
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 2616.00923
-  tps: 2040.53116
+  dps: 2565.69332
+  tps: 2001.82661
   hps: 42.30553
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Average-Default"
  value: {
-  dps: 8499.08392
-  tps: 6617.75529
-  hps: 83.9178
+  dps: 6499.25369
+  tps: 5070.53253
+  hps: 70.8007
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Settings-Dwarf-p7-twisting-naxx-P7 Twist-p5p6p7-twist-FullBuffs-P7-Consumes-TwistStack-LongMultiTarget"
  value: {
-  dps: 13854.18392
-  tps: 12197.67609
-  hps: 86.71557
+  dps: 11384.35641
+  tps: 10131.85452
+  hps: 73.66767
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Settings-Dwarf-p7-twisting-naxx-P7 Twist-p5p6p7-twist-FullBuffs-P7-Consumes-TwistStack-LongSingleTarget"
  value: {
-  dps: 8517.03854
-  tps: 6630.38832
-  hps: 85.1804
+  dps: 6606.00628
+  tps: 5153.10021
+  hps: 71.60383
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Settings-Dwarf-p7-twisting-naxx-P7 Twist-p5p6p7-twist-FullBuffs-P7-Consumes-TwistStack-ShortSingleTarget"
  value: {
-  dps: 8903.40334
-  tps: 6938.4355
-  hps: 86.79283
+  dps: 6905.13553
+  tps: 5389.78792
+  hps: 73.64733
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Settings-Dwarf-p7-twisting-naxx-P7 Twist-p5p6p7-twist-NoBuffs-P7-Consumes-TwistStack-LongMultiTarget"
  value: {
-  dps: 5364.17959
-  tps: 5184.02365
+  dps: 4427.24204
+  tps: 4323.1229
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Settings-Dwarf-p7-twisting-naxx-P7 Twist-p5p6p7-twist-NoBuffs-P7-Consumes-TwistStack-LongSingleTarget"
  value: {
-  dps: 3410.16106
-  tps: 2675.19462
+  dps: 2636.79904
+  tps: 2073.22405
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Settings-Dwarf-p7-twisting-naxx-P7 Twist-p5p6p7-twist-NoBuffs-P7-Consumes-TwistStack-ShortSingleTarget"
  value: {
-  dps: 3678.20346
-  tps: 2886.11586
+  dps: 2860.58679
+  tps: 2249.66709
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Settings-Human-p7-twisting-naxx-P7 Twist-p5p6p7-twist-FullBuffs-P7-Consumes-TwistStack-LongMultiTarget"
  value: {
-  dps: 13865.1005
-  tps: 12206.01986
-  hps: 86.71557
+  dps: 11391.75841
+  tps: 10137.70622
+  hps: 73.66767
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Settings-Human-p7-twisting-naxx-P7 Twist-p5p6p7-twist-FullBuffs-P7-Consumes-TwistStack-LongSingleTarget"
  value: {
-  dps: 8527.97914
-  tps: 6638.41819
-  hps: 85.1804
+  dps: 6610.23954
+  tps: 5156.39344
+  hps: 71.60383
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Settings-Human-p7-twisting-naxx-P7 Twist-p5p6p7-twist-FullBuffs-P7-Consumes-TwistStack-ShortSingleTarget"
  value: {
-  dps: 8913.14866
-  tps: 6945.87677
-  hps: 86.79283
+  dps: 6907.50819
+  tps: 5391.56461
+  hps: 73.64733
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Settings-Human-p7-twisting-naxx-P7 Twist-p5p6p7-twist-NoBuffs-P7-Consumes-TwistStack-LongMultiTarget"
  value: {
-  dps: 5367.53808
-  tps: 5186.06607
+  dps: 4429.23902
+  tps: 4324.17081
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Settings-Human-p7-twisting-naxx-P7 Twist-p5p6p7-twist-NoBuffs-P7-Consumes-TwistStack-LongSingleTarget"
  value: {
-  dps: 3413.72313
-  tps: 2677.86079
+  dps: 2637.39148
+  tps: 2073.60567
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-Settings-Human-p7-twisting-naxx-P7 Twist-p5p6p7-twist-NoBuffs-P7-Consumes-TwistStack-ShortSingleTarget"
  value: {
-  dps: 3679.89581
-  tps: 2887.39396
+  dps: 2862.88963
+  tps: 2251.43551
  }
 }
 dps_results: {
  key: "TestRetribution-Phase7-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7833.65041
-  tps: 6103.09127
-  hps: 75.4509
+  dps: 5880.17446
+  tps: 4589.37978
+  hps: 63.013
  }
 }
diff --git a/sim/paladin/retribution/TestSealStacking.results b/sim/paladin/retribution/TestSealStacking.results
index dd67e38aab..cf13069cdf 100644
--- a/sim/paladin/retribution/TestSealStacking.results
+++ b/sim/paladin/retribution/TestSealStacking.results
@@ -99,12 +99,12 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestSealStacking-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 3.00259
-  weights: 2.81353
+  weights: 2.62615
+  weights: 2.32522
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.51141
+  weights: 0.45549
   weights: 0
   weights: 0
   weights: 0
@@ -112,16 +112,16 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 4.59655
+  weights: 5.06307
   weights: 0.90652
   weights: 0
   weights: 0
-  weights: 1.0789
+  weights: 0.94364
   weights: 0
-  weights: 34.68638
+  weights: 28.27437
   weights: 0
   weights: 0
-  weights: 64.40218
+  weights: 53.39525
   weights: 0
   weights: 0
   weights: 0
@@ -148,12 +148,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestSealStacking-Phase7-Lvl60-StatWeights-Default"
  value: {
-  weights: 5.02884
-  weights: 3.82994
+  weights: 3.58631
+  weights: 2.3529
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.84485
+  weights: 0.53408
   weights: 0
   weights: 0
   weights: 0
@@ -161,13 +161,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 19.2046
-  weights: 0.8925
+  weights: 14.05298
+  weights: 0.83915
   weights: 0
   weights: 0
-  weights: 1.80699
+  weights: 1.28865
   weights: 0
-  weights: 66.40777
+  weights: 44.20366
   weights: 0
   weights: 0
   weights: 0
@@ -197,292 +197,292 @@ stat_weights_results: {
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 1733.54201
-  tps: 1386.26686
+  dps: 1707.53141
+  tps: 1366.25871
   hps: 26.57363
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 1716.02378
-  tps: 1371.80678
+  dps: 1688.43729
+  tps: 1350.58641
   hps: 26.23407
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 1815.26294
-  tps: 1451.23024
+  dps: 1785.68373
+  tps: 1428.47701
   hps: 26.1141
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 2944.16977
-  tps: 2336.9635
+  dps: 2780.31719
+  tps: 2210.92306
   hps: 38.10873
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1546.62266
-  tps: 1231.77032
+  dps: 1523.60458
+  tps: 1214.06411
   hps: 25.71353
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4578.37534
-  tps: 3596.26632
+  dps: 4030.3743
+  tps: 3174.47216
   hps: 56.72321
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Settings-Dwarf-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 9881.38209
-  tps: 9066.22582
+  dps: 9243.38831
+  tps: 8569.82476
   hps: 57.2424
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Settings-Dwarf-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 4471.43931
-  tps: 3513.10197
+  dps: 3930.87257
+  tps: 3097.06932
   hps: 55.83533
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Settings-Dwarf-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4757.19766
-  tps: 3737.4977
+  dps: 4204.0962
+  tps: 3311.58443
   hps: 59.17
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Settings-Dwarf-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 3468.7452
-  tps: 3536.78732
+  dps: 2995.34616
+  tps: 3085.13101
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Settings-Dwarf-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1714.98127
-  tps: 1361.93393
+  dps: 1420.35299
+  tps: 1131.0254
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Settings-Dwarf-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 1898.02835
-  tps: 1511.84135
+  dps: 1697.44607
+  tps: 1355.30515
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Settings-Human-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 10090.34652
-  tps: 9233.31956
+  dps: 9432.32504
+  tps: 8721.69564
   hps: 58.73283
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Settings-Human-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 4651.45751
-  tps: 3650.93383
+  dps: 4092.84165
+  tps: 3220.94567
   hps: 57.34813
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Settings-Human-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4947.04138
-  tps: 3884.27315
+  dps: 4372.24429
+  tps: 3441.75795
   hps: 61.488
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Settings-Human-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 3680.15336
-  tps: 3735.96816
+  dps: 3163.42889
+  tps: 3241.96867
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Settings-Human-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1790.82839
-  tps: 1421.05916
+  dps: 1521.35732
+  tps: 1210.25384
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-Settings-Human-p5-seal-stacking-P5 Seal Stacking-p5-seal-stacking-6CF-2DR-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 2020.91055
-  tps: 1605.89159
+  dps: 1791.17091
+  tps: 1427.55288
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3738.17707
-  tps: 2947.49197
+  dps: 3306.59351
+  tps: 2615.18321
   hps: 44.37953
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 2134.69212
-  tps: 1695.21956
+  dps: 2074.55585
+  tps: 1648.96089
   hps: 29.07463
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 2135.21912
-  tps: 1696.6269
+  dps: 2075.08285
+  tps: 1650.36823
   hps: 29.07463
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 2256.13519
-  tps: 1793.05067
+  dps: 2192.39825
+  tps: 1744.02226
   hps: 29.07463
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 4812.90784
-  tps: 3793.63877
+  dps: 4192.27564
+  tps: 3315.70348
   hps: 58.6332
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 2015.03865
-  tps: 1594.92564
+  dps: 1962.76851
+  tps: 1554.71784
   hps: 27.9807
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Average-Default"
  value: {
-  dps: 8386.47056
-  tps: 6541.17567
-  hps: 83.89156
+  dps: 5976.49111
+  tps: 4677.82981
+  hps: 70.25863
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Settings-Dwarf-p7-seal-stacking-naxx-P7 Seal Stacking-p7-seal-stacking-FullBuffs-P7-Consumes-TwistStack-LongMultiTarget"
  value: {
-  dps: 15308.0987
-  tps: 13533.46746
-  hps: 85.3329
+  dps: 12749.86226
+  tps: 11410.22647
+  hps: 71.8031
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Settings-Dwarf-p7-seal-stacking-naxx-P7 Seal Stacking-p7-seal-stacking-FullBuffs-P7-Consumes-TwistStack-LongSingleTarget"
  value: {
-  dps: 8427.29845
-  tps: 6572.74006
-  hps: 84.4179
+  dps: 6006.573
+  tps: 4699.73268
+  hps: 70.67663
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Settings-Dwarf-p7-seal-stacking-naxx-P7 Seal Stacking-p7-seal-stacking-FullBuffs-P7-Consumes-TwistStack-ShortSingleTarget"
  value: {
-  dps: 8998.56555
-  tps: 7020.21385
-  hps: 89.5785
+  dps: 6391.35562
+  tps: 5000.15084
+  hps: 74.89783
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Settings-Dwarf-p7-seal-stacking-naxx-P7 Seal Stacking-p7-seal-stacking-NoBuffs-P7-Consumes-TwistStack-LongMultiTarget"
  value: {
-  dps: 6660.53276
-  tps: 6426.89754
+  dps: 5503.00226
+  tps: 5374.53521
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Settings-Dwarf-p7-seal-stacking-naxx-P7 Seal Stacking-p7-seal-stacking-NoBuffs-P7-Consumes-TwistStack-LongSingleTarget"
  value: {
-  dps: 3413.83486
-  tps: 2688.95789
+  dps: 2491.44171
+  tps: 1971.12371
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Settings-Dwarf-p7-seal-stacking-naxx-P7 Seal Stacking-p7-seal-stacking-NoBuffs-P7-Consumes-TwistStack-ShortSingleTarget"
  value: {
-  dps: 3667.54081
-  tps: 2887.15558
+  dps: 2713.88638
+  tps: 2144.5167
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Settings-Human-p7-seal-stacking-naxx-P7 Seal Stacking-p7-seal-stacking-FullBuffs-P7-Consumes-TwistStack-LongMultiTarget"
  value: {
-  dps: 15315.21984
-  tps: 13538.54576
-  hps: 85.3329
+  dps: 12746.92196
+  tps: 11405.25775
+  hps: 71.84377
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Settings-Human-p7-seal-stacking-naxx-P7 Seal Stacking-p7-seal-stacking-FullBuffs-P7-Consumes-TwistStack-LongSingleTarget"
  value: {
-  dps: 8441.46923
-  tps: 6583.644
-  hps: 84.42807
+  dps: 6008.54847
+  tps: 4701.01194
+  hps: 70.67663
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Settings-Human-p7-seal-stacking-naxx-P7 Seal Stacking-p7-seal-stacking-FullBuffs-P7-Consumes-TwistStack-ShortSingleTarget"
  value: {
-  dps: 8999.45121
-  tps: 7020.84225
-  hps: 89.5785
+  dps: 6389.36803
+  tps: 4998.33865
+  hps: 74.89783
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Settings-Human-p7-seal-stacking-naxx-P7 Seal Stacking-p7-seal-stacking-NoBuffs-P7-Consumes-TwistStack-LongMultiTarget"
  value: {
-  dps: 6609.53956
-  tps: 6388.86192
+  dps: 5507.93315
+  tps: 5377.18572
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Settings-Human-p7-seal-stacking-naxx-P7 Seal Stacking-p7-seal-stacking-NoBuffs-P7-Consumes-TwistStack-LongSingleTarget"
  value: {
-  dps: 3428.87645
-  tps: 2700.43135
+  dps: 2509.59385
+  tps: 1985.60462
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-Settings-Human-p7-seal-stacking-naxx-P7 Seal Stacking-p7-seal-stacking-NoBuffs-P7-Consumes-TwistStack-ShortSingleTarget"
  value: {
-  dps: 3666.86355
-  tps: 2886.69404
+  dps: 2720.09393
+  tps: 2149.4073
  }
 }
 dps_results: {
  key: "TestSealStacking-Phase7-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7803.97419
-  tps: 6092.84089
-  hps: 75.08693
+  dps: 5444.06986
+  tps: 4266.67551
+  hps: 61.62627
  }
 }
diff --git a/sim/paladin/retribution/TestShockadin1H.results b/sim/paladin/retribution/TestShockadin1H.results
index 9580536e8e..e30aec7728 100644
--- a/sim/paladin/retribution/TestShockadin1H.results
+++ b/sim/paladin/retribution/TestShockadin1H.results
@@ -99,12 +99,12 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestShockadin1H-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 0.51333
-  weights: 1.4291
+  weights: 0.51403
+  weights: 1.6314
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.44389
+  weights: 1.27424
   weights: 0
   weights: 0
   weights: 0
@@ -112,16 +112,16 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.79165
-  weights: 8.9084
+  weights: 0.96694
+  weights: 10.04906
   weights: 0
   weights: 0
-  weights: 0.18445
-  weights: 11.10428
-  weights: 21.05079
+  weights: 0.1847
+  weights: 8.348
+  weights: 24.69669
   weights: 0
   weights: 0
-  weights: 19.4472
+  weights: 17.83218
   weights: 0
   weights: 0
   weights: 0
@@ -221,8 +221,8 @@ dps_results: {
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 2897.29324
-  tps: 2984.13932
+  dps: 2871.44201
+  tps: 2958.28809
   hps: 58.93617
  }
 }
@@ -237,107 +237,107 @@ dps_results: {
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 3988.81643
-  tps: 4074.62295
-  hps: 59.76752
+  dps: 3635.60022
+  tps: 3715.95961
+  hps: 59.76352
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Settings-Dwarf-p5-shockadin-P5 Shockadin-p5-shockadin-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 9004.49459
-  tps: 10732.66466
-  hps: 60.0118
+  dps: 8548.96413
+  tps: 10154.34846
+  hps: 60.27207
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Settings-Dwarf-p5-shockadin-P5 Shockadin-p5-shockadin-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 3968.08399
-  tps: 4054.17344
-  hps: 59.94673
+  dps: 3624.25939
+  tps: 3704.25361
+  hps: 59.87353
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Settings-Dwarf-p5-shockadin-P5 Shockadin-p5-shockadin-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4138.88666
-  tps: 4222.65354
-  hps: 59.048
+  dps: 3750.55172
+  tps: 3828.30441
+  hps: 58.88533
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Settings-Dwarf-p5-shockadin-P5 Shockadin-p5-shockadin-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 2189.63292
-  tps: 2465.71308
+  dps: 2173.256
+  tps: 2442.83616
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Settings-Dwarf-p5-shockadin-P5 Shockadin-p5-shockadin-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 921.58301
-  tps: 934.9266
+  dps: 891.16616
+  tps: 905.0785
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Settings-Dwarf-p5-shockadin-P5 Shockadin-p5-shockadin-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 1954.25239
-  tps: 1982.30073
+  dps: 1893.33749
+  tps: 1925.31291
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Settings-Human-p5-shockadin-P5 Shockadin-p5-shockadin-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 8922.75666
-  tps: 10642.00757
-  hps: 59.9874
+  dps: 8578.07425
+  tps: 10181.53528
+  hps: 60.2924
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Settings-Human-p5-shockadin-P5 Shockadin-p5-shockadin-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 3976.22448
-  tps: 4062.27963
-  hps: 59.93657
+  dps: 3638.36823
+  tps: 3718.60152
+  hps: 59.92437
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Settings-Human-p5-shockadin-P5 Shockadin-p5-shockadin-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 4141.60106
-  tps: 4225.29418
-  hps: 58.8955
+  dps: 3758.05482
+  tps: 3836.0163
+  hps: 58.88533
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Settings-Human-p5-shockadin-P5 Shockadin-p5-shockadin-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 2187.91941
-  tps: 2464.54124
+  dps: 2190.25494
+  tps: 2458.2101
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Settings-Human-p5-shockadin-P5 Shockadin-p5-shockadin-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 921.92025
-  tps: 935.20968
+  dps: 905.33617
+  tps: 919.49226
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-Settings-Human-p5-shockadin-P5 Shockadin-p5-shockadin-NoBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 1958.56981
-  tps: 1986.61815
+  dps: 1896.78852
+  tps: 1929.03478
  }
 }
 dps_results: {
  key: "TestShockadin1H-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3762.06357
-  tps: 3848.08412
-  hps: 49.28597
+  dps: 3413.77927
+  tps: 3494.81458
+  hps: 49.15787
  }
 }
 dps_results: {
diff --git a/sim/paladin/righteous_vengeance.go b/sim/paladin/righteous_vengeance.go
index d2b494dbd6..2d269ea284 100644
--- a/sim/paladin/righteous_vengeance.go
+++ b/sim/paladin/righteous_vengeance.go
@@ -65,7 +65,7 @@ func (paladin *Paladin) registerRV() {
 func (paladin *Paladin) procRV(sim *core.Simulation, result *core.SpellResult) {
 	dot := paladin.rv.Dot(result.Target)
 
-	newDamage := result.Damage * 0.5
+	newDamage := result.Damage * 0.3
 	outstandingDamage := core.TernaryFloat64(dot.IsActive(), dot.SnapshotBaseDamage*float64(dot.NumberOfTicks-dot.TickCount), 0)
 
 	dot.Snapshot(result.Target, (outstandingDamage+newDamage)/float64(RVTicks), false)
diff --git a/sim/priest/item_sets_pve_phase_4.go b/sim/priest/item_sets_pve_phase_4.go
index dafcd59cfe..a039cb1901 100644
--- a/sim/priest/item_sets_pve_phase_4.go
+++ b/sim/priest/item_sets_pve_phase_4.go
@@ -1,6 +1,8 @@
 package priest
 
 import (
+	"time"
+
 	"github.com/wowsims/sod/sim/core"
 	"github.com/wowsims/sod/sim/core/stats"
 )
@@ -113,35 +115,23 @@ func (priest *Priest) applyT1Shadow6PBonus() {
 		return
 	}
 
-	damageMod := priest.AddDynamicMod(core.SpellModConfig{
-		Kind:      core.SpellMod_DamageDone_Flat,
-		ClassMask: ClassSpellMask_PriestMindFlay,
-		IntValue:  50,
-	})
-
-	dotLengthMod := priest.AddDynamicMod(core.SpellModConfig{
-		Kind:       core.SpellMod_DotTickLength_Pct,
-		ClassMask:  ClassSpellMask_PriestMindFlay,
-		FloatValue: 0.50,
-	})
-
 	buffAura := priest.GetOrRegisterAura(core.Aura{
 		Label:    "Melting Faces",
 		ActionID: core.ActionID{SpellID: 456549},
 		Duration: core.NeverExpires,
-		OnGain: func(aura *core.Aura, sim *core.Simulation) {
-			damageMod.Activate()
-			dotLengthMod.Activate()
-		},
-		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
-			damageMod.Deactivate()
-			dotLengthMod.Deactivate()
-		},
 		OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) {
 			if spell.Matches(ClassSpellMask_PriestMindFlay) {
 				aura.Deactivate(sim)
 			}
 		},
+	}).AttachSpellMod(core.SpellModConfig{
+		Kind:      core.SpellMod_DamageDone_Flat,
+		ClassMask: ClassSpellMask_PriestMindFlay,
+		IntValue:  25,
+	}).AttachSpellMod(core.SpellModConfig{
+		Kind:      core.SpellMod_DotTickLength_Flat,
+		ClassMask: ClassSpellMask_PriestMindFlay,
+		TimeValue: -time.Millisecond * 505, // The extra 5 ms is to account for an in-game bug with channel clipping and was added in Phase 8
 	})
 
 	core.MakeProcTriggerAura(&priest.Unit, core.ProcTrigger{
diff --git a/sim/priest/item_sets_pve_phase_8.go b/sim/priest/item_sets_pve_phase_8.go
index 238d01ae28..00f6cce669 100644
--- a/sim/priest/item_sets_pve_phase_8.go
+++ b/sim/priest/item_sets_pve_phase_8.go
@@ -103,7 +103,7 @@ func (priest *Priest) applyScarletEnclaveShadow4PBonus() {
 }
 
 // Damage done by your Mind Flay now increases the longer you channel the spell.
-// Each time it deals damage, subsequent damage will increase by 100%.
+// Each time it deals damage, subsequent damage will increase by 75%.
 // This resets on each new channel.
 func (priest *Priest) applyScarletEnclaveShadow6PBonus() {
 	label := "S03 - Item - Scarlet Enclave - Priest - Shadow 6P Bonus"
@@ -115,7 +115,7 @@ func (priest *Priest) applyScarletEnclaveShadow6PBonus() {
 		Label: label,
 		OnPeriodicDamageDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 			if spell.Matches(ClassSpellMask_PriestMindFlay) {
-				spell.Dot(result.Target).SnapshotAttackerMultiplier *= 2.0
+				spell.Dot(result.Target).SnapshotAttackerMultiplier *= 1.75
 			}
 		},
 	}))
diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results
index acfd9f3b5b..23249df3e9 100644
--- a/sim/priest/shadow/TestShadow.results
+++ b/sim/priest/shadow/TestShadow.results
@@ -445,18 +445,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.35047
+  weights: 0.38572
   weights: 0
-  weights: 2.01258
+  weights: 1.96362
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 2.01258
+  weights: 1.96362
   weights: 0
   weights: 0
-  weights: 23.985
+  weights: 23.31813
   weights: 0
   weights: 0
   weights: 0
@@ -494,18 +494,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.46307
+  weights: 0.46894
   weights: 0
-  weights: 1.96729
+  weights: 1.92727
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.96729
+  weights: 1.92727
   weights: 0
   weights: 0.00072
-  weights: 30.36133
+  weights: 29.48026
   weights: 0
   weights: 0
   weights: 0
@@ -989,99 +989,99 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3556.58823
-  tps: 3298.53345
+  dps: 3469.0117
+  tps: 3215.77882
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4032.92611
-  tps: 4306.2449
+  dps: 4001.21474
+  tps: 4279.25949
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3529.86299
-  tps: 3271.66782
+  dps: 3443.08136
+  tps: 3188.09373
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3409.38288
-  tps: 3019.94613
+  dps: 3322.87019
+  tps: 2931.1772
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1786.75711
-  tps: 2021.3947
+  dps: 1776.79144
+  tps: 2009.5025
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1919.41795
-  tps: 1773.72973
+  dps: 1874.37203
+  tps: 1730.54797
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-NightElf-phase_4-Basic-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1877.57859
-  tps: 1650.50902
+  dps: 1840.09251
+  tps: 1613.28151
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-Troll-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4046.09639
-  tps: 4332.67808
+  dps: 4002.9152
+  tps: 4293.02849
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-Troll-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3526.82843
-  tps: 3270.73843
+  dps: 3439.17565
+  tps: 3186.13256
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-Troll-phase_4-Basic-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3415.55328
-  tps: 3036.74389
+  dps: 3335.80515
+  tps: 2953.90047
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-Troll-phase_4-Basic-phase_4-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1785.66409
-  tps: 2020.02369
+  dps: 1776.45758
+  tps: 2010.53521
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-Troll-phase_4-Basic-phase_4-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1909.61989
-  tps: 1763.98751
+  dps: 1867.40945
+  tps: 1724.23965
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-Settings-Troll-phase_4-Basic-phase_4-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1872.56767
-  tps: 1647.6211
+  dps: 1837.4645
+  tps: 1614.64904
  }
 }
 dps_results: {
  key: "TestShadow-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3526.82843
-  tps: 3270.73843
+  dps: 3439.17565
+  tps: 3186.13256
  }
 }
 dps_results: {
@@ -1157,50 +1157,50 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 3955.78337
-  tps: 3653.77039
+  dps: 3868.5862
+  tps: 3571.61931
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4219.1094
-  tps: 4437.66869
+  dps: 4204.95993
+  tps: 4427.42597
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3929.18667
-  tps: 3628.70241
+  dps: 3859.40779
+  tps: 3563.43331
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3725.82072
-  tps: 3266.99631
+  dps: 3699.12521
+  tps: 3242.15552
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2036.03984
-  tps: 2269.79046
+  dps: 2031.18966
+  tps: 2265.09203
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2101.97476
-  tps: 1930.17604
+  dps: 2065.82679
+  tps: 1895.57021
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-NightElf-phase_5_t1-Basic-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2032.78165
-  tps: 1769.50145
+  dps: 2024.07805
+  tps: 1759.0705
  }
 }
 dps_results: {
@@ -1248,43 +1248,43 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4199.9236
-  tps: 4433.94073
+  dps: 4186.60149
+  tps: 4426.56039
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3925.29434
-  tps: 3623.02524
+  dps: 3859.52181
+  tps: 3560.71141
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t1-Basic-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3711.65024
-  tps: 3260.33325
+  dps: 3682.16244
+  tps: 3234.55591
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t1-Basic-phase_5-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2016.75405
-  tps: 2248.70151
+  dps: 2010.58739
+  tps: 2242.32539
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t1-Basic-phase_5-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2099.63573
-  tps: 1925.88682
+  dps: 2063.39853
+  tps: 1891.9172
  }
 }
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-Settings-Troll-phase_5_t1-Basic-phase_5-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2023.81532
-  tps: 1764.882
+  dps: 2017.48109
+  tps: 1757.9568
  }
 }
 dps_results: {
@@ -1332,8 +1332,8 @@ dps_results: {
 dps_results: {
  key: "TestShadow-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3925.29434
-  tps: 3623.02524
+  dps: 3859.52181
+  tps: 3560.71141
  }
 }
 dps_results: {
diff --git a/sim/rogue/carnage.go b/sim/rogue/carnage.go
index e56a6bebb6..24b243f6cc 100644
--- a/sim/rogue/carnage.go
+++ b/sim/rogue/carnage.go
@@ -8,7 +8,7 @@ import (
 )
 
 func carnageMultiplier(spell *core.Spell, _ *core.AttackTable) float64 {
-	return core.TernaryFloat64(spell.Flags.Matches(SpellFlagCarnage), 1.08, 1)
+	return core.TernaryFloat64(spell.Flags.Matches(SpellFlagCarnage), 1.15, 1)
 }
 
 func (rogue *Rogue) applyCarnage() {
diff --git a/sim/rogue/crimson_tempest.go b/sim/rogue/crimson_tempest.go
index a0937f05de..bca38bf3f3 100644
--- a/sim/rogue/crimson_tempest.go
+++ b/sim/rogue/crimson_tempest.go
@@ -13,11 +13,12 @@ func (rogue *Rogue) makeCrimsonTempestHitSpell() *core.Spell {
 	procMask := core.ProcMaskMeleeMHSpecial
 
 	return rogue.RegisterSpell(core.SpellConfig{
-		ActionID:    actionID,
-		SpellSchool: core.SpellSchoolPhysical,
-		DefenseType: core.DefenseTypeMelee,
-		ProcMask:    procMask,
-		Flags:       core.SpellFlagMeleeMetrics | SpellFlagCarnage,
+		ClassSpellMask: ClassSpellMask_RogueCrimsonTempestHit,
+		ActionID:       actionID,
+		SpellSchool:    core.SpellSchoolPhysical,
+		DefenseType:    core.DefenseTypeMelee,
+		ProcMask:       procMask,
+		Flags:          core.SpellFlagMeleeMetrics | SpellFlagCarnage,
 
 		DamageMultiplier: 1,
 		ThreatMultiplier: 1,
diff --git a/sim/rogue/dps_rogue/TestAssassination.results b/sim/rogue/dps_rogue/TestAssassination.results
index da5b133dd2..1f4a844ea7 100644
--- a/sim/rogue/dps_rogue/TestAssassination.results
+++ b/sim/rogue/dps_rogue/TestAssassination.results
@@ -148,8 +148,8 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestAssassination-Phase1-Lvl25-StatWeights-Default"
  value: {
-  weights: 0.31949
-  weights: 0.53413
+  weights: 0.3277
+  weights: 0.54966
   weights: 0
   weights: 0
   weights: 0
@@ -165,9 +165,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.29044
-  weights: 2.57266
-  weights: 2.21929
+  weights: 0.29791
+  weights: 2.63935
+  weights: 2.29094
   weights: 0
   weights: 0
   weights: 0
@@ -197,8 +197,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestAssassination-Phase2-Lvl40-StatWeights-Default"
  value: {
-  weights: 0.40549
-  weights: 0.66551
+  weights: 0.41437
+  weights: 0.68181
   weights: 0
   weights: 0
   weights: 0
@@ -214,9 +214,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.36863
-  weights: 5.49537
-  weights: 4.34088
+  weights: 0.3767
+  weights: 5.50343
+  weights: 4.49574
   weights: 0
   weights: 0
   weights: 0
@@ -246,8 +246,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestAssassination-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 0.34654
-  weights: 0.55738
+  weights: 0.34938
+  weights: 0.55545
   weights: 0
   weights: 0
   weights: 0
@@ -263,9 +263,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.27395
-  weights: 13.16879
-  weights: 2.57083
+  weights: 0.27619
+  weights: 13.16805
+  weights: 2.62641
   weights: 0
   weights: 0
   weights: 0
@@ -302,99 +302,99 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Average-Default"
  value: {
-  dps: 280.18501
-  tps: 198.93136
+  dps: 288.44645
+  tps: 204.79698
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Settings-Human-p1_daggers-No Poisons-mutilate-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 284.13646
-  tps: 201.73689
+  dps: 292.53157
+  tps: 207.69741
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Settings-Human-p1_daggers-No Poisons-mutilate-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 284.13646
-  tps: 201.73689
+  dps: 292.53157
+  tps: 207.69741
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Settings-Human-p1_daggers-No Poisons-mutilate-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 287.33812
-  tps: 204.01007
+  dps: 296.37762
+  tps: 210.42811
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Settings-Human-p1_daggers-No Poisons-mutilate-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 134.3237
-  tps: 95.36983
+  dps: 138.41043
+  tps: 98.27141
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Settings-Human-p1_daggers-No Poisons-mutilate-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 134.3237
-  tps: 95.36983
+  dps: 138.41043
+  tps: 98.27141
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Settings-Human-p1_daggers-No Poisons-mutilate-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 135.60036
-  tps: 96.27625
+  dps: 139.96381
+  tps: 99.37431
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 273.87839
-  tps: 194.45366
+  dps: 282.25975
+  tps: 200.40442
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 273.87839
-  tps: 194.45366
+  dps: 282.25975
+  tps: 200.40442
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 278.86665
-  tps: 197.99532
+  dps: 288.14217
+  tps: 204.58094
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 135.77317
-  tps: 96.39895
+  dps: 140.03331
+  tps: 99.42365
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 135.77317
-  tps: 96.39895
+  dps: 140.03331
+  tps: 99.42365
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-Settings-Orc-p1_daggers-No Poisons-mutilate-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 138.31207
-  tps: 98.20157
+  dps: 143.01132
+  tps: 101.53803
  }
 }
 dps_results: {
  key: "TestAssassination-Phase1-Lvl25-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 267.9596
-  tps: 190.25132
+  dps: 276.05014
+  tps: 195.9956
  }
 }
 dps_results: {
@@ -408,114 +408,114 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Average-Default"
  value: {
-  dps: 599.36994
-  tps: 425.55266
+  dps: 614.38209
+  tps: 436.21128
   hps: 34.27404
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 604.73003
-  tps: 429.35832
+  dps: 619.83177
+  tps: 440.08056
   hps: 34.48167
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 604.73003
-  tps: 429.35832
+  dps: 619.83177
+  tps: 440.08056
   hps: 34.48167
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 631.25778
-  tps: 448.19302
+  dps: 647.14452
+  tps: 459.47261
   hps: 34.935
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 306.61424
-  tps: 217.69611
+  dps: 314.53143
+  tps: 223.31731
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 306.61424
-  tps: 217.69611
+  dps: 314.53143
+  tps: 223.31731
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 320.42068
-  tps: 227.49868
+  dps: 328.99862
+  tps: 233.58902
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 590.35984
-  tps: 419.15549
+  dps: 605.31831
+  tps: 429.776
   hps: 34.391
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 590.35984
-  tps: 419.15549
+  dps: 605.31831
+  tps: 429.776
   hps: 34.391
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 617.27323
-  tps: 438.26399
+  dps: 633.92357
+  tps: 450.08573
   hps: 34.085
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 311.93668
-  tps: 221.47505
+  dps: 319.98534
+  tps: 227.18959
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 311.93668
-  tps: 221.47505
+  dps: 319.98534
+  tps: 227.18959
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 327.75837
-  tps: 232.70844
+  dps: 337.05584
+  tps: 239.30965
  }
 }
 dps_results: {
  key: "TestAssassination-Phase2-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 577.85079
-  tps: 410.27406
+  dps: 592.74054
+  tps: 420.84578
   hps: 32.368
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-AllItems-BloodCorruptedLeathers"
  value: {
-  dps: 855.10167
-  tps: 607.12218
+  dps: 859.93344
+  tps: 610.55274
   hps: 50.83333
  }
 }
@@ -530,106 +530,106 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 910.72581
-  tps: 646.61532
+  dps: 920.3972
+  tps: 653.48201
   hps: 50.97153
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 992.65433
-  tps: 704.78458
+  dps: 1002.54254
+  tps: 711.8052
   hps: 50.94517
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 913.54162
-  tps: 648.61455
+  dps: 923.42982
+  tps: 655.63517
   hps: 50.94517
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1110.36273
-  tps: 788.35754
+  dps: 1138.22393
+  tps: 808.13899
   hps: 49.81667
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 366.65835
-  tps: 260.32743
+  dps: 371.10205
+  tps: 263.48246
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 322.7931
-  tps: 229.1831
+  dps: 327.2368
+  tps: 232.33813
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Human-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 406.874
-  tps: 288.88054
+  dps: 419.16605
+  tps: 297.60789
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1008.15358
-  tps: 715.78904
+  dps: 1018.41371
+  tps: 723.07373
   hps: 50.95533
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 929.04086
-  tps: 659.61901
+  dps: 939.30099
+  tps: 666.90371
   hps: 50.95533
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1146.98432
-  tps: 814.35887
+  dps: 1176.55622
+  tps: 835.35491
   hps: 49.81667
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 371.91006
-  tps: 264.05614
+  dps: 376.49939
+  tps: 267.31457
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 328.04481
-  tps: 232.91182
+  dps: 332.63414
+  tps: 236.17024
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-Settings-Orc-p5_backstab-No Poisons-P5_Assassination_Backstab-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 420.38628
-  tps: 298.47426
+  dps: 433.32532
+  tps: 307.66098
  }
 }
 dps_results: {
  key: "TestAssassination-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 713.16622
-  tps: 506.34802
+  dps: 723.09529
+  tps: 513.39766
   hps: 43.2185
  }
 }
diff --git a/sim/rogue/dps_rogue/TestCombat.results b/sim/rogue/dps_rogue/TestCombat.results
index 3e56192c92..03b90929ff 100644
--- a/sim/rogue/dps_rogue/TestCombat.results
+++ b/sim/rogue/dps_rogue/TestCombat.results
@@ -197,8 +197,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestCombat-Phase2-Lvl40-StatWeights-Default"
  value: {
-  weights: 0.37601
-  weights: 0.60813
+  weights: 0.38487
+  weights: 0.62503
   weights: 0
   weights: 0
   weights: 0
@@ -214,9 +214,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.34183
-  weights: 4.04906
-  weights: 3.74848
+  weights: 0.34989
+  weights: 4.08195
+  weights: 3.83857
   weights: 0
   weights: 0
   weights: 0
@@ -246,8 +246,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestCombat-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 1.55381
-  weights: 2.97459
+  weights: 1.69288
+  weights: 3.22196
   weights: 0
   weights: 0
   weights: 0
@@ -263,9 +263,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.22831
-  weights: 18.09251
-  weights: 18.54728
+  weights: 1.33825
+  weights: 18.2072
+  weights: 19.98466
   weights: 0
   weights: 0
   weights: 0
@@ -408,114 +408,114 @@ dps_results: {
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Average-Default"
  value: {
-  dps: 543.26531
-  tps: 385.71837
+  dps: 558.40923
+  tps: 396.47055
   hps: 34.19956
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 625.34338
-  tps: 443.9938
+  dps: 643.05922
+  tps: 456.57204
   hps: 34.391
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 546.3579
-  tps: 387.91411
+  dps: 561.36004
+  tps: 398.56563
   hps: 34.391
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 603.52605
-  tps: 428.50349
+  dps: 621.95997
+  tps: 441.59158
   hps: 36.66333
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 305.40391
-  tps: 216.83677
+  dps: 315.57302
+  tps: 224.05685
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 267.56813
-  tps: 189.97337
+  dps: 276.04852
+  tps: 195.99445
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Settings-Human-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 302.84199
-  tps: 215.01782
+  dps: 312.84588
+  tps: 222.12058
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 616.07714
-  tps: 437.41477
+  dps: 633.79807
+  tps: 449.99663
   hps: 34.36267
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 533.16776
-  tps: 378.54911
+  dps: 547.87102
+  tps: 388.98843
   hps: 34.36267
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 596.13607
-  tps: 423.25661
+  dps: 614.49861
+  tps: 436.29401
   hps: 36.23833
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 313.85304
-  tps: 222.83566
+  dps: 323.88172
+  tps: 229.95602
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 272.76797
-  tps: 193.66526
+  dps: 281.02656
+  tps: 199.52886
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-Settings-Orc-p2_daggers-No Poisons-mutilate-NoBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 305.53757
-  tps: 216.93168
+  dps: 315.64624
+  tps: 224.10883
  }
 }
 dps_results: {
  key: "TestCombat-Phase2-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 518.35971
-  tps: 368.0354
+  dps: 533.31739
+  tps: 378.65535
   hps: 32.05067
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-AllItems-BloodCorruptedLeathers"
  value: {
-  dps: 1164.62268
-  tps: 826.8821
+  dps: 1194.58783
+  tps: 848.15736
   hps: 53.44617
  }
 }
@@ -530,106 +530,106 @@ dps_results: {
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4183.05848
-  tps: 2969.97152
+  dps: 4524.77988
+  tps: 3212.59371
   hps: 68.86625
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4739.47409
-  tps: 3365.0266
+  dps: 5110.85499
+  tps: 3628.70704
   hps: 68.90967
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 4186.7935
-  tps: 2972.62338
+  dps: 4529.19961
+  tps: 3215.73172
   hps: 69.2045
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 4314.09552
-  tps: 3063.00782
+  dps: 4661.42654
+  tps: 3309.61284
   hps: 69.0825
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1617.83384
-  tps: 1148.66202
+  dps: 1750.30293
+  tps: 1242.71508
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1437.7258
-  tps: 1020.78532
+  dps: 1562.27493
+  tps: 1109.2152
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Human-p5_saber-No Poisons-P5_Saber-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1462.7866
-  tps: 1038.57849
+  dps: 1586.99562
+  tps: 1126.76689
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4873.49942
-  tps: 3460.18459
+  dps: 5259.57267
+  tps: 3734.29659
   hps: 68.90967
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 4284.63984
-  tps: 3042.09428
+  dps: 4639.55326
+  tps: 3294.08281
   hps: 68.991
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 4382.44708
-  tps: 3111.53743
+  dps: 4737.1393
+  tps: 3363.3689
   hps: 68.21833
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1686.5907
-  tps: 1197.47939
+  dps: 1828.1682
+  tps: 1297.99942
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1495.03659
-  tps: 1061.47598
+  dps: 1628.16382
+  tps: 1155.99631
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-Settings-Orc-p5_saber-No Poisons-P5_Saber-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1549.16007
-  tps: 1099.90365
+  dps: 1684.20597
+  tps: 1195.78624
  }
 }
 dps_results: {
  key: "TestCombat-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3579.9334
-  tps: 2541.75271
+  dps: 3886.68527
+  tps: 2759.54654
   hps: 58.75317
  }
 }
diff --git a/sim/rogue/item_sets_phase_4.go b/sim/rogue/item_sets_phase_4.go
index 3a16877f74..a324a581d0 100644
--- a/sim/rogue/item_sets_phase_4.go
+++ b/sim/rogue/item_sets_phase_4.go
@@ -167,7 +167,7 @@ func (rogue *Rogue) applyT1Tank2PBonus() {
 		return
 	}
 
-	classSpellMasks := ClassSpellMask_RogueCrimsonTempest | SpellClassMask_RogueBlunderbuss | SpellClassMask_RogueFanOfKnives
+	classSpellMasks := ClassSpellMask_RogueCrimsonTempest | ClassSpellMask_RogueCrimsonTempestHit | SpellClassMask_RogueBlunderbuss | SpellClassMask_RogueFanOfKnives
 	buffAura := rogue.RegisterAura(core.Aura{
 		ActionID: core.ActionID{SpellID: 457351},
 		Label:    fmt.Sprintf("Blade Dance (%s)", label),
diff --git a/sim/rogue/item_sets_phase_8.go b/sim/rogue/item_sets_phase_8.go
index fcfdc7fc84..97ca9f2b11 100644
--- a/sim/rogue/item_sets_phase_8.go
+++ b/sim/rogue/item_sets_phase_8.go
@@ -26,8 +26,8 @@ var ItemSetDuskwraithArmor = core.NewItemSet(core.ItemSet{
 })
 
 // 2P
-// While Just a Flesh Wound is not active, your Backstab, Sinister Strike, Saber Slash, and Mutilate deal 10% increased damage per your active Poison or Bleed effect
-// afflicting the target, up to a maximum increase of 30%
+// While Just a Flesh Wound is not active, your Backstab, Sinister Strike, Saber Slash, and Mutilate deal 20% increased damage per your active Poison or Bleed effect
+// afflicting the target, up to a maximum increase of 60%
 func (rogue *Rogue) applyScarletEnclaveDamage2PBonus() {
 	if rogue.HasRune(proto.RogueRune_RuneJustAFleshWound) {
 		return
@@ -54,8 +54,8 @@ func (rogue *Rogue) applyScarletEnclaveDamage2PBonus() {
 		Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 			totalBleedsAndPoisons := rogue.PoisonsActive[rogue.CurrentTarget.UnitIndex] + rogue.BleedsActive[rogue.CurrentTarget.UnitIndex]
 
-			// Only apply the damage mod up to 3 times for the 30% bonus maximum
-			damageMod.UpdateFloatValue(1 + 0.10*float64(min(3, totalBleedsAndPoisons)))
+			// Only apply the damage mod up to 3 times for the 60% bonus maximum
+			damageMod.UpdateFloatValue(1 + 0.20*float64(min(3, totalBleedsAndPoisons)))
 			damageMod.Activate()
 		},
 	})
@@ -103,7 +103,7 @@ func (rogue *Rogue) applyScarletEnclaveDamage6PBonus() {
 		ActionID: core.ActionID{SpellID: 1226871},
 	}).AttachSpellMod(core.SpellModConfig{
 		Kind:      core.SpellMod_DamageDone_Flat,
-		ClassMask: ClassSpellMask_RogueAmbush | ClassSpellMask_RogueEviscerate | ClassSpellMask_RogueCrimsonTempest | ClassSpellMask_RogueEnvenom,
+		ClassMask: ClassSpellMask_RogueAmbush | ClassSpellMask_RogueEviscerate | ClassSpellMask_RogueCrimsonTempestHit | ClassSpellMask_RogueEnvenom,
 		IntValue:  50,
 	}))
 }
diff --git a/sim/rogue/items.go b/sim/rogue/items.go
index 7f24fad97a..37aee1996f 100644
--- a/sim/rogue/items.go
+++ b/sim/rogue/items.go
@@ -201,8 +201,10 @@ func init() {
 	core.AddEffectsToTest = true
 }
 
-// Your Backstab, Mutilate, and Saber Slash critical strikes set the duration of your Rupture on the target to 16 secs
+// Your Backstab, Mutilate, and Saber Slash critical strikes set the duration of your Rupture and Crimson Tempest on the target to 16 secs
 func (rogue *Rogue) ApplyQueensfallRogueEffect(aura *core.Aura) {
+	hasCrimsonTempest := rogue.HasRune(proto.RogueRune_RuneCrimsonTempest)
+
 	aura.AttachProcTrigger(core.ProcTrigger{
 		Name:           "Queensfall Trigger - Rogue",
 		Callback:       core.CallbackOnSpellHitDealt,
@@ -214,6 +216,13 @@ func (rogue *Rogue) ApplyQueensfallRogueEffect(aura *core.Aura) {
 				dot.RecomputeAuraDuration()
 				dot.Rollover(sim)
 			}
+			if hasCrimsonTempest {
+				if dot := rogue.CrimsonTempestBleed.Dot(result.Target); dot.IsActive() {
+					dot.NumberOfTicks = int32(16 / dot.TickLength.Seconds())
+					dot.RecomputeAuraDuration()
+					dot.Rollover(sim)
+				}
+			}
 		},
 	})
 }
diff --git a/sim/rogue/mutilate.go b/sim/rogue/mutilate.go
index 1be511ca03..dbacd90045 100644
--- a/sim/rogue/mutilate.go
+++ b/sim/rogue/mutilate.go
@@ -16,8 +16,6 @@ func (rogue *Rogue) newMutilateHitSpell(isMH bool) *core.Spell {
 		procMask = core.ProcMaskMeleeOHSpecial
 	}
 
-	// waylay := rogue.HasRune(proto.RogueRune_RuneWaylay)
-
 	flatDamageBonus := rogue.baseRuneAbilityDamage()
 
 	return rogue.RegisterSpell(core.SpellConfig{
@@ -36,12 +34,7 @@ func (rogue *Rogue) newMutilateHitSpell(isMH bool) *core.Spell {
 		BonusCoefficient: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			var baseDamage float64
-			if isMH {
-				baseDamage = flatDamageBonus*0.8 + spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower())*0.8
-			} else {
-				baseDamage = flatDamageBonus*0.8 + spell.Unit.OHNormalizedWeaponDamage(sim, spell.MeleeAttackPower())*0.8
-			}
+			baseDamage := 0.9 * (flatDamageBonus + core.TernaryFloat64(isMH, spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower()), spell.Unit.OHNormalizedWeaponDamage(sim, spell.MeleeAttackPower())))
 
 			// TODO: Add support for all poison effects (such as chipped bite proc), if they apply ;)
 			oldMultiplier := spell.GetDamageMultiplier()
diff --git a/sim/rogue/rogue.go b/sim/rogue/rogue.go
index fa21781797..ff13672399 100644
--- a/sim/rogue/rogue.go
+++ b/sim/rogue/rogue.go
@@ -28,6 +28,7 @@ const (
 	ClassSpellMask_RogueBladeFlurry
 	SpellClassMask_RogueBlunderbuss
 	ClassSpellMask_RogueCrimsonTempest
+	ClassSpellMask_RogueCrimsonTempestHit
 	ClassSpellMask_RogueDeadlyPoisonTick
 	ClassSpellMask_RogueEnvenom
 	SpellClassMask_RogueEvasion
@@ -59,7 +60,7 @@ const (
 	ClassSpellMask_RogueBackstabDependent = ClassSpellMask_RogueBackstab | ClassSpellMask_RogueMutilate | ClassSpellMask_RogueMutilateHit
 
 	// Rupture and spells that benefit from effects that benefit it
-	ClassSpellMask_RogueRuptureDependent = ClassSpellMask_RogueRupture | ClassSpellMask_RogueCrimsonTempest
+	ClassSpellMask_RogueRuptureDependent = ClassSpellMask_RogueRupture | ClassSpellMask_RogueCrimsonTempest | ClassSpellMask_RogueCrimsonTempestHit
 
 	ClassSpellMask_RoguePoisonDependent = ClassSpellMask_RogueInstantPoison | ClassSpellMask_RogueDeadlyPoisonTick | ClassSpellMask_RogueOccultPoisonTick | ClassSpellMask_RogueEnvenom
 )
diff --git a/sim/rogue/runes.go b/sim/rogue/runes.go
index c086a6aa20..192eb713f7 100644
--- a/sim/rogue/runes.go
+++ b/sim/rogue/runes.go
@@ -425,7 +425,7 @@ func (rogue *Rogue) applySlaughterfromtheShadows() {
 
 	rogue.OnSpellRegistered(func(spell *core.Spell) {
 		if spell.Matches(ClassSpellMask_RogueAmbush | ClassSpellMask_RogueBackstab) {
-			spell.ApplyMultiplicativeDamageBonus(1.60)
+			spell.ApplyMultiplicativeDamageBonus(1.75)
 			spell.Cost.FlatModifier -= 30
 		}
 	})
diff --git a/sim/rogue/saber_slash.go b/sim/rogue/saber_slash.go
index 07c4e45936..f657f9048f 100644
--- a/sim/rogue/saber_slash.go
+++ b/sim/rogue/saber_slash.go
@@ -121,5 +121,5 @@ func (rogue *Rogue) registerSaberSlashSpell() {
 }
 
 func (rogue *Rogue) saberSlashMultiplier(stacks int32) float64 {
-	return []float64{1, 1.33, 1.67, 2.0}[stacks]
+	return []float64{1, 1.40, 1.80, 2.20}[stacks]
 }
diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results
index 8b5235e83e..39c07a79d9 100644
--- a/sim/shaman/enhancement/TestEnhancement.results
+++ b/sim/shaman/enhancement/TestEnhancement.results
@@ -1243,91 +1243,91 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 5701.58969
-  tps: 4380.48746
-  hps: 31.1405
+  dps: 5172.57782
+  tps: 4035.62501
+  hps: 28.83267
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 4168.45022
-  tps: 2785.73812
-  hps: 31.24217
+  dps: 3775.07952
+  tps: 2546.13594
+  hps: 28.47683
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 4172.66262
-  tps: 2724.03309
-  hps: 29.585
+  dps: 3863.10781
+  tps: 2531.80794
+  hps: 27.755
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2090.02155
-  tps: 1846.77623
+  dps: 1886.15779
+  tps: 1715.45657
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1579.79596
-  tps: 1065.29579
+  dps: 1436.67551
+  tps: 975.76771
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1746.1237
-  tps: 1134.59967
+  dps: 1612.64084
+  tps: 1054.99961
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 5696.511
-  tps: 4379.08144
-  hps: 31.171
+  dps: 5172.57782
+  tps: 4035.62501
+  hps: 28.83267
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 4167.70195
-  tps: 2785.10106
-  hps: 31.232
+  dps: 3775.07952
+  tps: 2546.13594
+  hps: 28.47683
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 4172.66262
-  tps: 2724.03309
-  hps: 29.585
+  dps: 3863.10781
+  tps: 2531.80794
+  hps: 27.755
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2090.02155
-  tps: 1846.77623
+  dps: 1886.15779
+  tps: 1715.45657
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1579.79596
-  tps: 1065.29579
+  dps: 1436.67551
+  tps: 975.76771
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1746.1237
-  tps: 1134.59967
+  dps: 1612.64084
+  tps: 1054.99961
  }
 }
 dps_results: {
@@ -1423,91 +1423,91 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 5745.04791
-  tps: 4411.68574
-  hps: 31.27267
+  dps: 5206.73388
+  tps: 4060.80221
+  hps: 28.7005
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 4228.34249
-  tps: 2820.71032
-  hps: 31.82167
+  dps: 3793.95572
+  tps: 2553.69464
+  hps: 28.5785
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 4419.52024
-  tps: 2870.30231
-  hps: 32.025
+  dps: 3897.40498
+  tps: 2527.70112
+  hps: 29.17833
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2145.62111
-  tps: 1884.73394
+  dps: 1948.58164
+  tps: 1759.74054
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1613.29016
-  tps: 1085.67331
+  dps: 1491.24506
+  tps: 1010.38033
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1866.48361
-  tps: 1211.16126
+  dps: 1763.14477
+  tps: 1153.69594
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 5748.3643
-  tps: 4414.62179
-  hps: 31.18117
+  dps: 5206.73388
+  tps: 4060.80221
+  hps: 28.7005
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 4233.98805
-  tps: 2824.45786
-  hps: 31.8725
+  dps: 3793.86688
+  tps: 2553.65021
+  hps: 28.55817
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 4419.52024
-  tps: 2870.30231
-  hps: 32.025
+  dps: 3897.40498
+  tps: 2527.70112
+  hps: 29.17833
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2145.62111
-  tps: 1884.73394
+  dps: 1949.29261
+  tps: 1760.16205
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1613.80737
-  tps: 1085.74341
+  dps: 1490.28107
+  tps: 1009.51217
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1866.48361
-  tps: 1211.16126
+  dps: 1763.14477
+  tps: 1153.69594
  }
 }
 dps_results: {
@@ -1691,91 +1691,91 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 6627.8601
-  tps: 5055.15944
-  hps: 31.55733
+  dps: 5990.42324
+  tps: 4624.57986
+  hps: 29.2739
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 4751.67647
-  tps: 3203.21499
-  hps: 31.52277
+  dps: 4331.67412
+  tps: 2933.03068
+  hps: 29.2922
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 4866.34823
-  tps: 3182.74582
-  hps: 32.086
+  dps: 4456.02998
+  tps: 2920.60007
+  hps: 27.70417
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2312.76537
-  tps: 2029.76707
+  dps: 2095.4544
+  tps: 1890.04087
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1739.637
-  tps: 1183.60147
+  dps: 1588.86917
+  tps: 1085.8447
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1923.85152
-  tps: 1261.38918
+  dps: 1805.38561
+  tps: 1191.78595
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 6621.59257
-  tps: 5047.24485
-  hps: 31.537
+  dps: 5990.42324
+  tps: 4624.57986
+  hps: 29.2739
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 4751.67647
-  tps: 3203.21499
-  hps: 31.52277
+  dps: 4331.67412
+  tps: 2933.03068
+  hps: 29.2922
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 4866.34823
-  tps: 3182.74582
-  hps: 32.086
+  dps: 4456.02998
+  tps: 2920.60007
+  hps: 27.70417
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2312.58789
-  tps: 2029.33116
+  dps: 2095.4544
+  tps: 1890.04087
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1739.83811
-  tps: 1183.8582
+  dps: 1589.09643
+  tps: 1085.7263
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1923.85152
-  tps: 1261.38918
+  dps: 1805.38561
+  tps: 1191.78595
  }
 }
 dps_results: {
@@ -1871,91 +1871,91 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 6588.42727
-  tps: 5020.34089
-  hps: 31.92537
+  dps: 5898.76279
+  tps: 4567.94406
+  hps: 29.11327
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 4737.75339
-  tps: 3191.43794
-  hps: 32.14903
+  dps: 4313.32149
+  tps: 2920.8405
+  hps: 29.31253
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 4918.13896
-  tps: 3214.29181
-  hps: 33.71267
+  dps: 4452.78412
+  tps: 2912.15395
+  hps: 27.877
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2331.06598
-  tps: 2041.14521
+  dps: 2133.83753
+  tps: 1912.19946
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1759.22249
-  tps: 1193.82166
+  dps: 1607.33935
+  tps: 1097.28706
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1991.80644
-  tps: 1304.89515
+  dps: 1889.53711
+  tps: 1246.56554
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 6588.42727
-  tps: 5020.34089
-  hps: 31.92537
+  dps: 5898.76279
+  tps: 4567.94406
+  hps: 29.11327
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 4737.75339
-  tps: 3191.43794
-  hps: 32.14903
+  dps: 4313.32149
+  tps: 2920.8405
+  hps: 29.31253
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 4918.13896
-  tps: 3214.29181
-  hps: 33.71267
+  dps: 4452.78412
+  tps: 2912.15395
+  hps: 27.877
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2328.4678
-  tps: 2039.20366
+  dps: 2133.83753
+  tps: 1912.19946
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1759.22249
-  tps: 1193.82166
+  dps: 1607.33935
+  tps: 1097.28706
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1991.80644
-  tps: 1304.89515
+  dps: 1889.53711
+  tps: 1246.56554
  }
 }
 dps_results: {
@@ -2139,91 +2139,91 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 8324.33508
-  tps: 6158.66717
-  hps: 32.13683
+  dps: 7624.45419
+  tps: 5718.99789
+  hps: 29.22917
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 6452.7545
-  tps: 4374.6276
-  hps: 32.25883
+  dps: 5894.64725
+  tps: 4013.62388
+  hps: 29.3105
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 6571.96546
-  tps: 4353.15246
-  hps: 32.58417
+  dps: 6069.0854
+  tps: 4036.33379
+  hps: 28.00917
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 3101.88822
-  tps: 2615.93814
+  dps: 2864.38475
+  tps: 2461.87547
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2435.45445
-  tps: 1671.5885
+  dps: 2263.73628
+  tps: 1560.52432
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2725.39528
-  tps: 1814.40241
+  dps: 2585.77639
+  tps: 1730.63839
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 8324.46673
-  tps: 6158.75933
-  hps: 32.13683
+  dps: 7624.45419
+  tps: 5718.99789
+  hps: 29.22917
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 6452.7545
-  tps: 4374.6276
-  hps: 32.25883
+  dps: 5894.64725
+  tps: 4013.62388
+  hps: 29.3105
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 6571.96546
-  tps: 4353.15246
-  hps: 32.58417
+  dps: 6069.0854
+  tps: 4036.33379
+  hps: 28.00917
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 3101.88822
-  tps: 2615.93814
+  dps: 2864.38475
+  tps: 2461.87547
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2435.45445
-  tps: 1671.5885
+  dps: 2263.73628
+  tps: 1560.52432
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Orc-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2725.39528
-  tps: 1814.40241
+  dps: 2585.77639
+  tps: 1730.63839
  }
 }
 dps_results: {
@@ -2319,91 +2319,91 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 7970.48239
-  tps: 5933.91145
-  hps: 31.13033
+  dps: 7325.70322
+  tps: 5518.33737
+  hps: 28.71067
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 6147.95156
-  tps: 4162.94481
-  hps: 31.69967
+  dps: 5642.10128
+  tps: 3847.86661
+  hps: 28.47683
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 6339.06536
-  tps: 4217.35531
-  hps: 32.83833
+  dps: 5836.41239
+  tps: 3887.56843
+  hps: 28.26333
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 2938.98023
-  tps: 2507.93532
+  dps: 2736.57907
+  tps: 2377.19471
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2327.88719
-  tps: 1597.55424
+  dps: 2149.92027
+  tps: 1481.4505
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Auto-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2587.52892
-  tps: 1723.25778
+  dps: 2428.91685
+  tps: 1633.60087
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 7970.48239
-  tps: 5933.91145
-  hps: 31.13033
+  dps: 7325.70322
+  tps: 5518.33737
+  hps: 28.71067
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 6149.93639
-  tps: 4165.52514
-  hps: 31.67933
+  dps: 5642.10128
+  tps: 3847.86661
+  hps: 28.47683
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 6339.06536
-  tps: 4217.35531
-  hps: 32.83833
+  dps: 5836.41239
+  tps: 3887.56843
+  hps: 28.26333
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 2938.98023
-  tps: 2507.93532
+  dps: 2732.18086
+  tps: 2374.80154
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2327.88719
-  tps: 1597.55424
+  dps: 2150.50489
+  tps: 1482.46601
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase6-Lvl60-Settings-Troll-phase_6_2h-Sync Delay OH-phase_6-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2587.52892
-  tps: 1723.25778
+  dps: 2428.91685
+  tps: 1633.60087
  }
 }
 dps_results: {
diff --git a/sim/shaman/item_sets_pve_phase_7.go b/sim/shaman/item_sets_pve_phase_7.go
index f30ee6e87d..a406502820 100644
--- a/sim/shaman/item_sets_pve_phase_7.go
+++ b/sim/shaman/item_sets_pve_phase_7.go
@@ -26,7 +26,9 @@ var ItemSetTheEarthshatterersStorm = core.NewItemSet(core.ItemSet{
 	},
 })
 
-// Increases periodic damage done by your Flame Shock ability by 20%.
+const EleTier32pFlameShockDamageBonus = 40
+
+// Increases periodic damage done by your Flame Shock ability by 40%.
 func (shaman *Shaman) applyNaxxramasElemental2PBonus() {
 	label := "S03 - Item - Naxxramas - Shaman - Elemental 2P Bonus"
 	if shaman.HasAura(label) {
@@ -38,7 +40,7 @@ func (shaman *Shaman) applyNaxxramasElemental2PBonus() {
 	}).AttachSpellMod(core.SpellModConfig{
 		ClassMask: ClassSpellMask_ShamanFlameShock,
 		Kind:      core.SpellMod_PeriodicDamageDone_Flat,
-		IntValue:  20,
+		IntValue:  EleTier32pFlameShockDamageBonus,
 	}))
 }
 
diff --git a/sim/shaman/item_sets_pve_phase_8.go b/sim/shaman/item_sets_pve_phase_8.go
index 8ca50a56d2..ef9ddc2031 100644
--- a/sim/shaman/item_sets_pve_phase_8.go
+++ b/sim/shaman/item_sets_pve_phase_8.go
@@ -25,17 +25,26 @@ var ItemSetTheSoulcrushersStorm = core.NewItemSet(core.ItemSet{
 	},
 })
 
-// When your Lava Burst strikes a target afflicted with your Flame Shock Rank 5 or Rank 6, it also deals one pulse of Flame Shock's damage.
+// When your Lightning Bolt, Lava Burst, or Chain Lightning strike a target afflicted with your Flame Shock Rank 5 or Rank 6, they also deal one pulse of Flame Shock's damage.
 func (shaman *Shaman) applyScarletEnclaveElemental2PBonus() {
-	if !shaman.HasRune(proto.ShamanRune_RuneHandsLavaBurst) {
-		return
-	}
-
 	label := "S03 - Item - Scarlet Enclave - Shaman - Elemental 2P Bonus"
 	if shaman.HasAura(label) {
 		return
 	}
 
+	// These interactions are unlisted but confirmed by Zirene. All stack multiplicatively.
+	// -1 per point of Concussion because the ticks double dip
+	// 40% from Tier 3 2-piece
+	// 60% from Storm, Earth, and Fire
+	damageMultiplier := 1.0
+	damageMultiplier *= 1 - 0.01*float64(shaman.Talents.Concussion)
+	if shaman.HasSetBonus(ItemSetTheEarthshatterersStorm, 2) {
+		damageMultiplier *= 1 + EleTier32pFlameShockDamageBonus/100
+	}
+	if shaman.HasRune(proto.ShamanRune_RuneCloakStormEarthAndFire) {
+		damageMultiplier *= 1 + StormEarthAndFireFlameShockDamageBonus/100
+	}
+
 	flameShockCopy := shaman.RegisterSpell(core.SpellConfig{
 		ActionID:       core.ActionID{SpellID: 1226972}.WithTag(1),
 		ClassSpellMask: ClassSpellMask_ShamanFlameShock,
@@ -53,7 +62,7 @@ func (shaman *Shaman) applyScarletEnclaveElemental2PBonus() {
 			TickLength:    0,
 		},
 
-		DamageMultiplier: 1,
+		DamageMultiplier: damageMultiplier,
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {},
@@ -71,7 +80,7 @@ func (shaman *Shaman) applyScarletEnclaveElemental2PBonus() {
 			}
 		},
 		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
-			if spell.Matches(ClassSpellMask_ShamanLavaBurst) && result.Landed() {
+			if spell.Matches(ClassSpellMask_ShamanLightningBolt|ClassSpellMask_ShamanChainLightning|ClassSpellMask_ShamanLavaBurst) && result.Landed() {
 				for _, spell := range flameShockSpells {
 					if dot := spell.Dot(result.Target); dot.IsActive() {
 						flameShockCopy.Cast(sim, result.Target)
@@ -84,7 +93,9 @@ func (shaman *Shaman) applyScarletEnclaveElemental2PBonus() {
 	}))
 }
 
-// Increases the chance to trigger your Overload by an additional 10%. Additionally, each time Lightning Bolt or Chain Lightning damages a target, your next Lava Burst deals 10% increased damage, stacking up to 5 times.
+// Increases the chance to trigger your Overload by an additional 10%.
+// Additionally, each time Lightning Bolt or Chain Lightning damages a target, your next Lava Burst deals 10% increased damage, stacking up to 5 times.
+// Your Lava Burst deals increased damage equal to its critical strike chance.
 func (shaman *Shaman) applyScarletEnclaveElemental4PBonus() {
 	label := "S03 - Item - Scarlet Enclave - Shaman - Elemental 4P Bonus"
 	if shaman.HasAura(label) {
@@ -123,6 +134,7 @@ func (shaman *Shaman) applyScarletEnclaveElemental4PBonus() {
 		Label: label,
 		OnInit: func(aura *core.Aura, sim *core.Simulation) {
 			shaman.overloadProcChance += 0.10
+			shaman.useLavaBurstCritScaling = true
 		},
 		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 			if spell.Matches(classMask) && result.Landed() {
@@ -169,8 +181,7 @@ var ItemSetTheSoulcrushersRage = core.NewItemSet(core.ItemSet{
 	},
 })
 
-// While Static Shock is active, Lava Lash, Lava Burst, and Stormstrike have a 100% chance to add charges to your Lightning Shield.
-// While dual-wielding, you will gain 1 charge, and while using a two-handed weapon you will gain 2 charges.
+// While Static Shock is active, Lava Lash, Lava Burst, and Stormstrike have a 100% chance to add 1 charge to your Lightning Shield.
 // If charges exceed 9, Lightning Shield will immediately deal damage to your target instead of adding charges.
 func (shaman *Shaman) applyScarletEnclaveEnhancement2PBonus() {
 	if !shaman.HasRune(proto.ShamanRune_RuneBracersStaticShock) {
@@ -193,20 +204,12 @@ func (shaman *Shaman) applyScarletEnclaveEnhancement2PBonus() {
 				}
 
 				shaman.ActiveShieldAura.AddStack(sim) // Add back the charge removed
-
-				if shaman.MainHand().HandType == proto.HandType_HandTypeTwoHand {
-					if shaman.ActiveShieldAura.GetStacks() == 9 {
-						shaman.LightningShieldProcs[shaman.ActiveShield.Rank].Cast(sim, result.Target)
-					}
-
-					shaman.ActiveShieldAura.AddStack(sim) // Add back the charge removed
-				}
 			}
 		},
 	}))
 }
 
-// Reduces the cooldown on your Fire Nova Totem by 50%, increases its damage by 150%, and reduces its mana cost by 50%.
+// Reduces the cooldown on your Fire Nova Totem by 60%, increases its damage by 200%, and reduces its mana cost by 50%.
 // Additionally, your Fire Nova Totem now activates instantly on cast.
 func (shaman *Shaman) applyScarletEnclaveEnhancement4PBonus() {
 	if shaman.HasRune(proto.ShamanRune_RuneWaistFireNova) {
@@ -223,11 +226,11 @@ func (shaman *Shaman) applyScarletEnclaveEnhancement4PBonus() {
 	})).AttachSpellMod(core.SpellModConfig{
 		ClassMask: ClassSpellMask_ShamanFireNovaTotem,
 		Kind:      core.SpellMod_Cooldown_Multi_Flat,
-		IntValue:  -50,
+		IntValue:  -60,
 	}).AttachSpellMod(core.SpellModConfig{
 		ClassMask: ClassSpellMask_ShamanFireNovaTotemAttack,
 		Kind:      core.SpellMod_DamageDone_Flat,
-		IntValue:  150,
+		IntValue:  200,
 	}).AttachSpellMod(core.SpellModConfig{
 		ClassMask: ClassSpellMask_ShamanFireNovaTotem,
 		Kind:      core.SpellMod_PowerCost_Pct,
@@ -263,9 +266,7 @@ func (shaman *Shaman) applyScarletEnclaveEnhancement6PBonus() {
 		},
 	})
 
-	if shaman.MainHand().HandType == proto.HandType_HandTypeTwoHand {
-		core.MakePermanent(twoHandedBonusAura)
-	}
+	core.MakePermanent(twoHandedBonusAura)
 	shaman.RegisterItemSwapCallback(core.AllWeaponSlots(), func(sim *core.Simulation, slot proto.ItemSlot) {
 		if shaman.MainHand().HandType == proto.HandType_HandTypeTwoHand {
 			twoHandedBonusAura.Activate(sim)
@@ -301,7 +302,7 @@ func (shaman *Shaman) applyScarletEnclaveEnhancement6PBonus() {
 		},
 		OnApplyEffects: func(_ *core.Aura, _ *core.Simulation, _ *core.Unit, spell *core.Spell) {
 			if spell.Matches(shaman.MaelstromWeaponClassMask) {
-				damageMod.UpdateFloatValue(1 + max(0, 0.10*float64(shaman.MaelstromWeaponAura.GetStacks()-5)))
+				damageMod.UpdateFloatValue(1 + max(0, 0.20*float64(shaman.MaelstromWeaponAura.GetStacks()-5)))
 			}
 		},
 		OnCastComplete: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell) {
diff --git a/sim/shaman/items.go b/sim/shaman/items.go
index 7d2a521a55..a94ca52907 100644
--- a/sim/shaman/items.go
+++ b/sim/shaman/items.go
@@ -126,7 +126,7 @@ func init() {
 
 	// https://www.wowhead.com/classic-ptr/item=240921/scarlet-smashbringer
 	// Equip: The Global Cooldown of your Shock, Lightning, and Lava Burst spells is reduced by 0.5 seconds.
-	// Chance on hit: Increases the wielder's Strength by 250 for 15 sec.
+	// Chance on hit: Increases the wielder's Strength by 200 for 15 sec.
 	core.NewItemEffect(ScarletSmashbringer, func(agent core.Agent) {
 		shaman := agent.(ShamanAgent).GetShaman()
 
@@ -138,7 +138,7 @@ func init() {
 		})
 
 		itemhelpers.AddWeaponProcAura(shaman.GetCharacter(), ScarletSmashbringer, "Scarlet Smashbringer", 0.9, func(character *core.Character) *core.Aura {
-			return character.NewTemporaryStatsAura("Holy Might", core.ActionID{SpellID: 1231551}, stats.Stats{stats.Strength: 250}, time.Second*15)
+			return character.NewTemporaryStatsAura("Holy Might", core.ActionID{SpellID: 1231551}, stats.Stats{stats.Strength: 200}, time.Second*15)
 		})
 	})
 
diff --git a/sim/shaman/runes.go b/sim/shaman/runes.go
index 571ffaad55..0156b5ed9c 100644
--- a/sim/shaman/runes.go
+++ b/sim/shaman/runes.go
@@ -183,6 +183,8 @@ func (shaman *Shaman) applyMentalDexterity() {
 	})
 }
 
+const StormEarthAndFireFlameShockDamageBonus = 60
+
 func (shaman *Shaman) applyStormEarthAndFire() {
 	if !shaman.HasRune(proto.ShamanRune_RuneCloakStormEarthAndFire) {
 		return
@@ -193,7 +195,7 @@ func (shaman *Shaman) applyStormEarthAndFire() {
 	}).AttachSpellMod(core.SpellModConfig{
 		ClassMask: ClassSpellMask_ShamanFlameShock,
 		Kind:      core.SpellMod_PeriodicDamageDone_Flat,
-		IntValue:  60,
+		IntValue:  StormEarthAndFireFlameShockDamageBonus,
 	}).AttachSpellMod(core.SpellModConfig{
 		ClassMask: ClassSpellMask_ShamanChainLightning,
 		Kind:      core.SpellMod_Cooldown_Multi_Flat,
@@ -304,9 +306,8 @@ func (shaman *Shaman) applyTwoHandedMastery() {
 
 	procSpellId := int32(436365)
 
-	// Two-handed mastery gives +15% AP, +30% attack speed, and +10% spell hit
-	attackSpeedMultiplier := 1.5
-	apMultiplier := 1.15
+	attackSpeedMultiplier := 1.35
+	apMultiplier := 1.10
 	spellHitIncrease := core.SpellHitRatingPerHitChance * 10.0
 
 	statDep := shaman.NewDynamicMultiplyStat(stats.AttackPower, apMultiplier)
diff --git a/sim/warlock/item_sets_pve_phase_7.go b/sim/warlock/item_sets_pve_phase_7.go
index 214651e5fc..86f29430ec 100644
--- a/sim/warlock/item_sets_pve_phase_7.go
+++ b/sim/warlock/item_sets_pve_phase_7.go
@@ -92,7 +92,7 @@ func (warlock *Warlock) applyNaxxramasDamage4PBonus() {
 			ProcMask:       core.ProcMaskSpellDamage,
 			Flags:          core.SpellFlagTreatAsPeriodic | core.SpellFlagPureDot | core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell | WarlockFlagHaunt | spellConfig.Flags,
 
-			DamageMultiplier: 0.75,
+			DamageMultiplier: 0.33,
 			ThreatMultiplier: 1,
 
 			ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {},
diff --git a/sim/warlock/item_sets_pve_phase_8.go b/sim/warlock/item_sets_pve_phase_8.go
index c711cbeb09..3b4ac7cebb 100644
--- a/sim/warlock/item_sets_pve_phase_8.go
+++ b/sim/warlock/item_sets_pve_phase_8.go
@@ -40,7 +40,7 @@ func (warlock *Warlock) applyScarletEnclaveDamage2PBonus() {
 		SpellSchool: core.SpellSchoolShadow | core.SpellSchoolFire,
 		DefenseType: core.DefenseTypeMagic,
 		ProcMask:    core.ProcMaskEmpty,
-		Flags:       core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell | core.SpellFlagIgnoreAttackerModifiers,
+		Flags:       core.SpellFlagNoOnCastComplete | core.SpellFlagPassiveSpell | core.SpellFlagIgnoreAttackerModifiers | core.SpellFlagIgnoreTargetModifiers,
 
 		DamageMultiplier: 1,
 		ThreatMultiplier: 1,
@@ -113,7 +113,7 @@ func (warlock *Warlock) applyScarletEnclaveDamage4PBonus() {
 	})
 }
 
-// Your periodic critical strikes grant 15% spellcasting haste for 15 sec, and your Backdraft grants an additional 15% spellcasting haste.
+// Your periodic critical strikes grant 20% spellcasting haste for 15 sec, and your Backdraft grants an additional 15% spellcasting haste.
 func (warlock *Warlock) applyScarletEnclaveDamage6PBonus() {
 	label := "S03 - Item - Scarlet Enclave - Warlock - Damage 6P Bonus"
 	if warlock.HasAura(label) {
@@ -124,17 +124,15 @@ func (warlock *Warlock) applyScarletEnclaveDamage6PBonus() {
 		ActionID: core.ActionID{SpellID: 1227200},
 		Label:    "Wickedness",
 		Duration: time.Second * 15,
-	}).AttachMultiplyCastSpeed(&warlock.Unit, 1.15)
+	}).AttachMultiplyCastSpeed(&warlock.Unit, 1.20)
 
 	core.MakePermanent(warlock.RegisterAura(core.Aura{
 		Label: label,
 		OnInit: func(aura *core.Aura, sim *core.Simulation) {
-			if warlock.BackdraftAura != nil {
-				warlock.BackdraftAura.AttachDependentAura(hasteAura)
-			}
+			warlock.backdraftCastSpeed += 0.15
 		},
 		OnPeriodicDamageDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
-			if result.DidCrit() {
+			if result.DidCrit() && spell.Matches(ClassSpellMask_WarlockAll) {
 				hasteAura.Activate(sim)
 			}
 		},
diff --git a/sim/warlock/runes.go b/sim/warlock/runes.go
index 13f1ac849f..848b84e409 100644
--- a/sim/warlock/runes.go
+++ b/sim/warlock/runes.go
@@ -175,11 +175,13 @@ func (warlock *Warlock) applyBackdraft() {
 		return
 	}
 
+	warlock.backdraftCastSpeed += 1.30
+
 	warlock.BackdraftAura = warlock.RegisterAura(core.Aura{
 		Label:    "Backdraft",
 		ActionID: core.ActionID{SpellID: 427714},
 		Duration: time.Second * 15,
-	}).AttachMultiplyCastSpeed(&warlock.Unit, 1.3)
+	}).AttachMultiplyCastSpeed(&warlock.Unit, warlock.backdraftCastSpeed)
 }
 
 func (warlock *Warlock) applyDecimation() {
diff --git a/sim/warlock/warlock.go b/sim/warlock/warlock.go
index 903829b7f6..abc84dbe51 100644
--- a/sim/warlock/warlock.go
+++ b/sim/warlock/warlock.go
@@ -159,6 +159,7 @@ type Warlock struct {
 	DPSPAggregate float64
 
 	// Extra state and logic variables
+	backdraftCastSpeed           float64
 	demonicKnowledgeSp           float64
 	maintainBuffsOnSacrifice     bool    // Whether to disable the Master Demonologist and Demonic Sacrifice buffs when sacrificing/summoning pets. Used by TAQ 4pc
 	masterDemonologistMultiplier float64 // Bonus multiplier applied to the Master Demonologist talent
diff --git a/sim/warrior/dps_warrior/TestDualWieldWarrior.results b/sim/warrior/dps_warrior/TestDualWieldWarrior.results
index 4d46ad998b..20082c8aec 100644
--- a/sim/warrior/dps_warrior/TestDualWieldWarrior.results
+++ b/sim/warrior/dps_warrior/TestDualWieldWarrior.results
@@ -246,8 +246,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-StatWeights-Default"
  value: {
-  weights: 1.93049
-  weights: 1.37771
+  weights: 2.52124
+  weights: -2.2313
   weights: 0
   weights: 0
   weights: 0
@@ -263,9 +263,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.50543
-  weights: 4.32908
-  weights: 28.59064
+  weights: 0.99315
+  weights: 3.11185
+  weights: 37.51362
   weights: 0
   weights: 0
   weights: 0
@@ -295,8 +295,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 3.38851
-  weights: 0.48579
+  weights: 1.7902
+  weights: 0.34027
   weights: 0
   weights: 0
   weights: 0
@@ -312,9 +312,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.24355
-  weights: 29.77413
-  weights: 29.92481
+  weights: 0.42206
+  weights: 37.35595
+  weights: 25.02605
   weights: 0
   weights: 0
   weights: 0
@@ -344,8 +344,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-StatWeights-Default"
  value: {
-  weights: 4.40183
-  weights: 6.55049
+  weights: 2.9634
+  weights: 3.91527
   weights: 0
   weights: 0
   weights: 0
@@ -361,9 +361,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.21088
-  weights: 18.19931
-  weights: 37.2506
+  weights: 2.89441
+  weights: 8.51147
+  weights: 45.73715
   weights: 0
   weights: 0
   weights: 0
@@ -555,106 +555,106 @@ dps_results: {
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 4198.92203
-  tps: 3282.69982
-  hps: 75.4338
+  dps: 3859.50385
+  tps: 3026.32023
+  hps: 75.25062
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 10280.05474
-  tps: 8812.58097
+  dps: 9378.44422
+  tps: 8097.54442
   hps: 67.23217
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 4066.80552
-  tps: 3183.8412
-  hps: 76.189
+  dps: 3685.19641
+  tps: 2889.80086
+  hps: 76.23983
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 4646.06857
-  tps: 3622.7516
-  hps: 73.91167
+  dps: 4342.3457
+  tps: 3406.73107
+  hps: 74.2675
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3843.83334
-  tps: 3467.15637
+  dps: 3481.36043
+  tps: 3167.26957
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1510.43198
-  tps: 1257.03304
+  dps: 1368.20654
+  tps: 1151.22745
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Human-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1860.30867
-  tps: 1520.78926
+  dps: 1649.02135
+  tps: 1362.32924
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 10779.6871
-  tps: 9231.18466
-  hps: 66.98817
+  dps: 9911.95384
+  tps: 8515.1956
+  hps: 66.8865
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 4190.7557
-  tps: 3274.37185
-  hps: 75.86367
+  dps: 3868.51164
+  tps: 3031.35396
+  hps: 75.80267
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 4878.92936
-  tps: 3785.38978
-  hps: 73.70833
+  dps: 4560.5672
+  tps: 3550.54562
+  hps: 72.79333
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3973.33205
-  tps: 3570.77483
+  dps: 3515.09999
+  tps: 3192.87276
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1555.20223
-  tps: 1291.42956
+  dps: 1382.50841
+  tps: 1157.83178
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-Settings-Orc-phase_4_dw-Fury-phase_4_fury-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1937.58819
-  tps: 1580.02261
+  dps: 1747.78289
+  tps: 1437.94937
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3309.88444
-  tps: 2597.17882
+  dps: 3067.90676
+  tps: 2408.13757
   hps: 62.96217
  }
 }
@@ -709,197 +709,197 @@ dps_results: {
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4930.15247
-  tps: 3836.35316
-  hps: 71.47555
+  dps: 4561.56103
+  tps: 3555.05897
+  hps: 71.43473
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 9442.08458
-  tps: 7969.19492
-  hps: 72.8645
+  dps: 8822.75708
+  tps: 7478.08754
+  hps: 73.42367
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 4893.73596
-  tps: 3808.19845
-  hps: 72.18333
+  dps: 4533.9993
+  tps: 3535.61226
+  hps: 72.51883
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5548.64307
-  tps: 4297.27015
-  hps: 69.94667
+  dps: 5190.67135
+  tps: 4044.18884
+  hps: 69.9975
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3749.08828
-  tps: 3314.59978
+  dps: 3337.06031
+  tps: 2981.42815
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1650.31441
-  tps: 1329.95949
+  dps: 1490.66486
+  tps: 1212.83051
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1944.60519
-  tps: 1539.96131
+  dps: 1778.41631
+  tps: 1422.02145
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 7772.02684
-  tps: 6771.89392
+  dps: 7419.64331
+  tps: 6503.33489
   hps: 72.17317
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 4646.38126
-  tps: 3708.94228
+  dps: 4302.25531
+  tps: 3447.08614
   hps: 71.74617
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5349.37077
-  tps: 4261.41765
+  dps: 4945.59048
+  tps: 3952.91566
   hps: 69.79417
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2908.261
-  tps: 2677.89035
+  dps: 2798.36361
+  tps: 2596.35336
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1453.74403
-  tps: 1192.13106
+  dps: 1347.45412
+  tps: 1113.22275
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Human-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1745.67409
-  tps: 1413.31566
+  dps: 1619.94571
+  tps: 1320.02972
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 9440.99953
-  tps: 7958.34583
-  hps: 72.63067
+  dps: 8956.74886
+  tps: 7589.26821
+  hps: 72.94583
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 4951.22949
-  tps: 3862.81379
-  hps: 71.84783
+  dps: 4596.17619
+  tps: 3588.3683
+  hps: 71.80717
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5752.229
-  tps: 4466.65482
-  hps: 69.89583
+  dps: 5358.50788
+  tps: 4163.66583
+  hps: 69.48917
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3843.66741
-  tps: 3392.42531
+  dps: 3418.33823
+  tps: 3063.79238
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1694.18334
-  tps: 1366.44521
+  dps: 1518.42246
+  tps: 1235.77093
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t1-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2060.85689
-  tps: 1638.15801
+  dps: 1874.05591
+  tps: 1504.27972
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 7693.31909
-  tps: 6689.79423
+  dps: 7335.7062
+  tps: 6416.94009
   hps: 71.95967
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 4717.95414
-  tps: 3766.5263
+  dps: 4369.96329
+  tps: 3500.81571
   hps: 71.19717
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5581.39089
-  tps: 4444.80037
+  dps: 5165.41897
+  tps: 4125.82282
   hps: 69.13333
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2954.40756
-  tps: 2708.04114
+  dps: 2840.56439
+  tps: 2623.44672
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1492.60617
-  tps: 1219.80247
+  dps: 1384.10478
+  tps: 1139.22374
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-Settings-Orc-phase_5_dw_t2-Fury-phase_5_dw-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1859.37404
-  tps: 1508.17587
+  dps: 1721.6804
+  tps: 1404.70727
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3933.19962
-  tps: 3030.53333
-  hps: 60.77633
+  dps: 3629.64383
+  tps: 2807.69575
+  hps: 60.695
  }
 }
 dps_results: {
@@ -953,106 +953,106 @@ dps_results: {
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Average-Default"
  value: {
-  dps: 6610.04753
-  tps: 5392.87999
-  hps: 67.83384
+  dps: 5808.13224
+  tps: 4759.98322
+  hps: 67.79563
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Settings-Human-phase_6_dw-Fury-phase_6_dw-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 14023.74996
-  tps: 12605.77381
-  hps: 68.4725
+  dps: 13008.05082
+  tps: 11764.59749
+  hps: 68.34033
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Settings-Human-phase_6_dw-Fury-phase_6_dw-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 6512.26957
-  tps: 5316.52364
-  hps: 68.2285
+  dps: 5689.60986
+  tps: 4664.06251
+  hps: 67.84217
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Settings-Human-phase_6_dw-Fury-phase_6_dw-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 7007.14557
-  tps: 5710.86109
-  hps: 65.1175
+  dps: 6143.82345
+  tps: 5028.63035
+  hps: 65.06667
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Settings-Human-phase_6_dw-Fury-phase_6_dw-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 4670.46533
-  tps: 4298.89409
+  dps: 4270.37146
+  tps: 3960.60522
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Settings-Human-phase_6_dw-Fury-phase_6_dw-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2171.24939
-  tps: 1803.98515
+  dps: 1887.24174
+  tps: 1579.35687
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Settings-Human-phase_6_dw-Fury-phase_6_dw-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2541.56214
-  tps: 2106.89459
+  dps: 2236.59555
+  tps: 1869.35888
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Settings-Orc-phase_6_dw-Fury-phase_6_dw-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 14172.15625
-  tps: 12727.65674
-  hps: 68.34033
+  dps: 13056.87904
+  tps: 11807.54368
+  hps: 67.85233
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Settings-Orc-phase_6_dw-Fury-phase_6_dw-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 6617.19834
-  tps: 5398.72156
-  hps: 67.9235
+  dps: 5803.13852
+  tps: 4756.71047
+  hps: 67.81167
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Settings-Orc-phase_6_dw-Fury-phase_6_dw-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 7410.46466
-  tps: 6043.28106
-  hps: 65.67667
+  dps: 6501.39868
+  tps: 5327.0895
+  hps: 65.52417
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Settings-Orc-phase_6_dw-Fury-phase_6_dw-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 4819.7661
-  tps: 4430.81159
+  dps: 4362.40296
+  tps: 4043.90855
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Settings-Orc-phase_6_dw-Fury-phase_6_dw-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2176.67359
-  tps: 1808.53386
+  dps: 1902.04681
+  tps: 1591.62746
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-Settings-Orc-phase_6_dw-Fury-phase_6_dw-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2651.10082
-  tps: 2195.84554
+  dps: 2303.59318
+  tps: 1920.88147
  }
 }
 dps_results: {
  key: "TestDualWieldWarrior-Phase6-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 5641.91174
-  tps: 4594.85317
+  dps: 4981.50769
+  tps: 4073.99859
   hps: 60.22733
  }
 }
diff --git a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results
index ae9b053d2d..cea02373a4 100644
--- a/sim/warrior/dps_warrior/TestTwoHandedWarrior.results
+++ b/sim/warrior/dps_warrior/TestTwoHandedWarrior.results
@@ -148,8 +148,8 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-StatWeights-Default"
  value: {
-  weights: 1.14182
-  weights: 0.95252
+  weights: 1.17813
+  weights: 0.91116
   weights: 0
   weights: 0
   weights: 0
@@ -165,9 +165,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.44002
-  weights: 14.6363
-  weights: 10.87872
+  weights: 0.51657
+  weights: 14.7956
+  weights: 10.4479
   weights: 0
   weights: 0
   weights: 0
@@ -197,8 +197,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 3.21076
-  weights: -0.87104
+  weights: 2.19459
+  weights: 1.4982
   weights: 0
   weights: 0
   weights: 0
@@ -214,9 +214,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.33581
+  weights: 1.12272
   weights: 0
-  weights: 26.196
+  weights: 26.41822
   weights: 0
   weights: 0
   weights: 0
@@ -246,8 +246,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-StatWeights-Default"
  value: {
-  weights: 3.76645
-  weights: 1.6034
+  weights: 1.71311
+  weights: 3.05648
   weights: 0
   weights: 0
   weights: 0
@@ -263,9 +263,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.59301
+  weights: -0.00752
   weights: 0
-  weights: 45.81015
+  weights: 43.17992
   weights: 0
   weights: 0
   weights: 0
@@ -303,107 +303,107 @@ dps_results: {
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Average-Default"
  value: {
-  dps: 1227.00845
-  tps: 1048.56494
-  hps: 23.10533
+  dps: 1202.34898
+  tps: 1027.74806
+  hps: 22.65691
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-LongMultiTarget"
  value: {
-  dps: 3486.07375
-  tps: 3496.95961
-  hps: 26.264
+  dps: 3403.67322
+  tps: 3412.49252
+  hps: 24.941
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-LongSingleTarget"
  value: {
-  dps: 1217.74506
-  tps: 1041.62023
-  hps: 23.19333
+  dps: 1196.4489
+  tps: 1024.69729
+  hps: 22.736
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-ShortSingleTarget"
  value: {
-  dps: 1308.52971
-  tps: 1123.5486
-  hps: 22.785
+  dps: 1305.75182
+  tps: 1122.79898
+  hps: 22.9075
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-LongMultiTarget"
  value: {
-  dps: 1474.1056
-  tps: 1680.74964
+  dps: 1456.03396
+  tps: 1653.95058
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-LongSingleTarget"
  value: {
-  dps: 532.50106
-  tps: 468.81315
+  dps: 527.02669
+  tps: 463.66208
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Human-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-ShortSingleTarget"
  value: {
-  dps: 602.1092
-  tps: 532.52099
+  dps: 590.43291
+  tps: 522.1917
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-LongMultiTarget"
  value: {
-  dps: 3538.71011
-  tps: 3545.84239
-  hps: 25.73317
+  dps: 3451.54505
+  tps: 3451.26733
+  hps: 24.58167
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-LongSingleTarget"
  value: {
-  dps: 1223.41826
-  tps: 1045.89194
-  hps: 22.76867
+  dps: 1204.69105
+  tps: 1029.11109
+  hps: 22.30317
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-FullBuffs-P3-Consumes-ShortSingleTarget"
  value: {
-  dps: 1342.22743
-  tps: 1151.75988
-  hps: 22.54
+  dps: 1316.3597
+  tps: 1130.16408
+  hps: 22.13167
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-LongMultiTarget"
  value: {
-  dps: 1489.45134
-  tps: 1688.91305
+  dps: 1454.76025
+  tps: 1642.1577
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-LongSingleTarget"
  value: {
-  dps: 522.25112
-  tps: 459.03974
+  dps: 517.46703
+  tps: 455.02437
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-Settings-Orc-phase_3_2h-Arms-phase_3_arms-NoBuffs-P3-Consumes-ShortSingleTarget"
  value: {
-  dps: 605.86927
-  tps: 536.71235
+  dps: 596.82285
+  tps: 528.19598
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase3-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1124.92695
-  tps: 962.26079
-  hps: 21.25783
+  dps: 1111.06246
+  tps: 950.29707
+  hps: 20.86583
  }
 }
 dps_results: {
@@ -457,197 +457,197 @@ dps_results: {
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4660.97443
-  tps: 3552.98095
-  hps: 39.98015
+  dps: 4253.71124
+  tps: 3241.73207
+  hps: 39.39055
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4678.06982
-  tps: 3826.19658
-  hps: 40.443
+  dps: 4305.23061
+  tps: 3544.81554
+  hps: 40.02617
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 4601.5114
-  tps: 3507.61863
-  hps: 40.30067
+  dps: 4203.84871
+  tps: 3213.41418
+  hps: 39.833
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5300.76168
-  tps: 3990.58974
-  hps: 38.02333
+  dps: 4869.93941
+  tps: 3673.06438
+  hps: 37.46417
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1799.00818
-  tps: 1656.17749
+  dps: 1594.4586
+  tps: 1487.64578
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1764.33165
-  tps: 1365.59603
+  dps: 1551.22519
+  tps: 1200.68557
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2059.41096
-  tps: 1577.29116
+  dps: 1820.67606
+  tps: 1392.82614
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4371.12554
-  tps: 3547.10047
-  hps: 40.24983
+  dps: 4033.07532
+  tps: 3316.26768
+  hps: 39.57883
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 4303.40889
-  tps: 3249.04124
-  hps: 40.15833
+  dps: 3939.43902
+  tps: 2996.10367
+  hps: 39.4975
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5218.51834
-  tps: 3999.96897
-  hps: 38.17583
+  dps: 4761.35918
+  tps: 3666.00375
+  hps: 37.15917
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1554.67722
-  tps: 1422.16967
+  dps: 1399.80793
+  tps: 1304.92443
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1503.32137
-  tps: 1152.15241
+  dps: 1363.70547
+  tps: 1053.2335
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Human-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1880.49042
-  tps: 1456.6907
+  dps: 1687.51531
+  tps: 1319.20255
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4723.15196
-  tps: 3855.88995
-  hps: 39.99567
+  dps: 4305.455
+  tps: 3537.49577
+  hps: 39.44667
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 4645.68249
-  tps: 3538.86608
-  hps: 40.11767
+  dps: 4249.51256
+  tps: 3244.07656
+  hps: 39.467
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5372.38595
-  tps: 4055.99662
-  hps: 37.3625
+  dps: 4950.00925
+  tps: 3739.07467
+  hps: 36.905
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1820.19681
-  tps: 1661.96683
+  dps: 1593.49235
+  tps: 1481.32929
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1774.10746
-  tps: 1370.44278
+  dps: 1569.43921
+  tps: 1214.13163
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t1-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2117.25749
-  tps: 1617.04813
+  dps: 1877.53685
+  tps: 1435.2258
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 4183.45054
-  tps: 3381.11738
-  hps: 38.26733
+  dps: 3803.71515
+  tps: 3098.57445
+  hps: 37.52517
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 4128.02349
-  tps: 3113.08407
-  hps: 38.20633
+  dps: 3765.17194
+  tps: 2852.0784
+  hps: 37.55567
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 5040.55498
-  tps: 3848.72526
-  hps: 35.88833
+  dps: 4608.88789
+  tps: 3563.39565
+  hps: 35.2275
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1473.80202
-  tps: 1352.8111
+  dps: 1343.70929
+  tps: 1247.63748
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1443.59681
-  tps: 1105.94559
+  dps: 1310.96333
+  tps: 1010.53329
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-Settings-Orc-phase_5_2h_t2-Arms-phase_5_2h-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1854.34572
-  tps: 1428.25004
+  dps: 1675.53187
+  tps: 1305.10852
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3851.46126
-  tps: 2918.20109
-  hps: 34.23117
+  dps: 3511.17824
+  tps: 2661.60028
+  hps: 33.62117
  }
 }
 dps_results: {
@@ -701,106 +701,106 @@ dps_results: {
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Average-Default"
  value: {
-  dps: 6384.37358
-  tps: 5051.28515
-  hps: 41.30863
+  dps: 5528.95617
+  tps: 4388.03235
+  hps: 40.70542
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Settings-Human-phase_6_2h-Arms-phase_6_2h-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 6413.63874
-  tps: 5346.86989
-  hps: 41.83583
+  dps: 5530.44262
+  tps: 4658.70656
+  hps: 41.12417
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Settings-Human-phase_6_2h-Arms-phase_6_2h-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 6335.27172
-  tps: 5014.66838
-  hps: 41.77483
+  dps: 5478.91113
+  tps: 4350.31876
+  hps: 41.13433
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Settings-Human-phase_6_2h-Arms-phase_6_2h-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 7223.18271
-  tps: 5725.76598
-  hps: 40.46333
+  dps: 6211.28726
+  tps: 4937.82398
+  hps: 39.54833
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Settings-Human-phase_6_2h-Arms-phase_6_2h-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 2324.10428
-  tps: 2108.8228
+  dps: 2014.62751
+  tps: 1868.36015
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Settings-Human-phase_6_2h-Arms-phase_6_2h-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2269.14176
-  tps: 1822.72606
+  dps: 1967.12987
+  tps: 1584.80809
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Settings-Human-phase_6_2h-Arms-phase_6_2h-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2646.31874
-  tps: 2121.4653
+  dps: 2308.02039
+  tps: 1861.07864
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Settings-Orc-phase_6_2h-Arms-phase_6_2h-FullBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 6470.69248
-  tps: 5390.14345
-  hps: 41.36817
+  dps: 5589.48352
+  tps: 4702.55828
+  hps: 40.73783
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Settings-Orc-phase_6_2h-Arms-phase_6_2h-FullBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 6390.81065
-  tps: 5056.97728
-  hps: 41.34783
+  dps: 5525.40391
+  tps: 4385.9991
+  hps: 40.84967
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Settings-Orc-phase_6_2h-Arms-phase_6_2h-FullBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 7394.25932
-  tps: 5861.9749
-  hps: 39.39583
+  dps: 6371.0199
+  tps: 5065.21168
+  hps: 38.83667
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Settings-Orc-phase_6_2h-Arms-phase_6_2h-NoBuffs-P6-Consumes-LongMultiTarget"
  value: {
-  dps: 2351.51217
-  tps: 2134.42445
+  dps: 2046.62343
+  tps: 1893.94958
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Settings-Orc-phase_6_2h-Arms-phase_6_2h-NoBuffs-P6-Consumes-LongSingleTarget"
  value: {
-  dps: 2322.06009
-  tps: 1863.06638
+  dps: 1999.58417
+  tps: 1610.36457
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-Settings-Orc-phase_6_2h-Arms-phase_6_2h-NoBuffs-P6-Consumes-ShortSingleTarget"
  value: {
-  dps: 2783.21024
-  tps: 2234.01972
+  dps: 2387.37801
+  tps: 1924.144
  }
 }
 dps_results: {
  key: "TestTwoHandedWarrior-Phase6-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 5735.51018
-  tps: 4524.27722
-  hps: 37.6065
+  dps: 4955.95443
+  tps: 3921.28642
+  hps: 36.88467
  }
 }
diff --git a/sim/warrior/item_sets_pve_phase_4.go b/sim/warrior/item_sets_pve_phase_4.go
index a052a37d5b..d295727320 100644
--- a/sim/warrior/item_sets_pve_phase_4.go
+++ b/sim/warrior/item_sets_pve_phase_4.go
@@ -190,18 +190,18 @@ func (warrior *Warrior) applyT1Damage6PBonus() {
 		ActionID: core.ActionID{SpellID: 457816},
 		Label:    "Battle Forecast",
 		Duration: duration,
-	}).AttachMultiplicativePseudoStatBuff(&warrior.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexPhysical], 1.10)
+	}).AttachMultiplicativePseudoStatBuff(&warrior.PseudoStats.SchoolDamageDealtMultiplier[stats.SchoolIndexPhysical], 1.05)
 
 	defenseAura := warrior.RegisterAura(core.Aura{
 		ActionID: core.ActionID{SpellID: 457814},
 		Label:    "Defense Forecast",
 		Duration: duration,
-	}).AttachMultiplicativePseudoStatBuff(&warrior.PseudoStats.DamageTakenMultiplier, 0.90)
+	}).AttachMultiplicativePseudoStatBuff(&warrior.PseudoStats.DamageTakenMultiplier, 0.95)
 
 	berserkAura := warrior.NewTemporaryStatsAura(
 		"Berserker Forecast",
 		core.ActionID{SpellID: 457817},
-		stats.Stats{stats.MeleeCrit: 10 * core.CritRatingPerCritChance},
+		stats.Stats{stats.MeleeCrit: 5 * core.CritRatingPerCritChance},
 		duration,
 	)
 
diff --git a/sim/warrior/item_sets_pve_phase_5.go b/sim/warrior/item_sets_pve_phase_5.go
index 5638fb9b34..866838110c 100644
--- a/sim/warrior/item_sets_pve_phase_5.go
+++ b/sim/warrior/item_sets_pve_phase_5.go
@@ -46,28 +46,19 @@ func (warrior *Warrior) applyT2Damage2PBonus() {
 	}))
 }
 
-// Increases the damage of Heroic Strike, Overpower, and Slam by 25%
+// Increases the damage of Heroic Strike, Overpower, and Slam by 10%
 func (warrior *Warrior) applyT2Damage4PBonus() {
 	label := "S03 - Item - T2 - Warrior - Damage 4P Bonus"
 	if warrior.HasAura(label) {
 		return
 	}
 
-	warrior.RegisterAura(core.Aura{
+	core.MakePermanent(warrior.RegisterAura(core.Aura{
 		Label: label,
-		OnInit: func(aura *core.Aura, sim *core.Simulation) {
-			warrior.HeroicStrike.ApplyMultiplicativeDamageBonus(1.25)
-			warrior.Overpower.ApplyMultiplicativeDamageBonus(1.25)
-			if warrior.SlamMH != nil {
-				warrior.SlamMH.ApplyMultiplicativeDamageBonus(1.25)
-			}
-			if warrior.SlamOH != nil {
-				warrior.SlamMH.ApplyMultiplicativeDamageBonus(1.25)
-			}
-			if warrior.QuickStrike != nil {
-				warrior.QuickStrike.ApplyMultiplicativeDamageBonus(1.25)
-			}
-		},
+	})).AttachSpellMod(core.SpellModConfig{
+		Kind:      core.SpellMod_DamageDone_Flat,
+		ClassMask: ClassSpellMask_WarriorHeroicStrike | ClassSpellMask_WarriorQuickStrike | ClassSpellMask_WarriorOverpower | ClassSpellMask_WarriorSlamMH | ClassSpellMask_WarriorSlamOH,
+		IntValue:  10,
 	})
 }
 
diff --git a/sim/warrior/item_sets_pve_phase_6.go b/sim/warrior/item_sets_pve_phase_6.go
index 71f585d62b..3595daaf3e 100644
--- a/sim/warrior/item_sets_pve_phase_6.go
+++ b/sim/warrior/item_sets_pve_phase_6.go
@@ -41,7 +41,7 @@ func (warrior *Warrior) applyTAQDamage2PBonus() {
 	})
 }
 
-// You deal 20% increased damage while any nearby enemy is afflicted with both your Rend and your Deep Wounds.
+// You deal 15% increased damage while any nearby enemy is afflicted with both your Rend and your Deep Wounds.
 func (warrior *Warrior) applyTAQDamage4PBonus() {
 	if warrior.Talents.DeepWounds == 0 {
 		return
@@ -56,7 +56,7 @@ func (warrior *Warrior) applyTAQDamage4PBonus() {
 		ActionID: core.ActionID{SpellID: 1214166},
 		Label:    "Bloodythirsty",
 		Duration: time.Second * 3,
-	}).AttachMultiplicativePseudoStatBuff(&warrior.PseudoStats.DamageDealtMultiplier, 1.20)
+	}).AttachMultiplicativePseudoStatBuff(&warrior.PseudoStats.DamageDealtMultiplier, 1.15)
 
 	core.MakePermanent(warrior.RegisterAura(core.Aura{
 		Label: label,
diff --git a/sim/warrior/item_sets_pve_phase_8.go b/sim/warrior/item_sets_pve_phase_8.go
index 4beaf58e42..c8dc50e698 100644
--- a/sim/warrior/item_sets_pve_phase_8.go
+++ b/sim/warrior/item_sets_pve_phase_8.go
@@ -48,7 +48,6 @@ func (warrior *Warrior) applyScarletEnclaveDamage2PBonus() {
 }
 
 // Each time you hit a target with Whirlwind, Heroic Strike, Quick Strike, or Cleave, the damage of your next Slam is increased by 20%, stacking up to 5 times.
-// If you are wielding a two-handed weapon, you will gain 2 stacks each time.
 func (warrior *Warrior) applyScarletEnclaveDamage4PBonus() {
 	label := "S03 - Item - Scarlet Enclave - Warrior - Damage 4P Bonus"
 	if warrior.HasAura(label) {
@@ -86,16 +85,12 @@ func (warrior *Warrior) applyScarletEnclaveDamage4PBonus() {
 		Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 			buffAura.Activate(sim)
 			buffAura.AddStack(sim)
-
-			if warrior.MainHand().HandType == proto.HandType_HandTypeTwoHand {
-				buffAura.AddStack(sim)
-			}
 		},
 	})
 }
 
 // Each time Deep Wounds deals damage, it reduces the remaining cooldown on your Whirlwind by 3 sec.
-// Whirlwind deals 50% increased damage to targets afflicted with your Deep Wounds.
+// Whirlwind deals 100% increased damage to targets afflicted with your Deep Wounds.
 func (warrior *Warrior) applyScarletEnclaveDamage6PBonus() {
 	if warrior.Talents.DeepWounds == 0 {
 		return
@@ -123,7 +118,7 @@ func (warrior *Warrior) applyScarletEnclaveDamage6PBonus() {
 		},
 		OnApplyEffects: func(aura *core.Aura, sim *core.Simulation, target *core.Unit, spell *core.Spell) {
 			if spell.Matches(classMask) {
-				damageMod.UpdateFloatValue(core.TernaryFloat64(warrior.DeepWounds.Dot(target).IsActive(), 1.5, 1.0))
+				damageMod.UpdateFloatValue(core.TernaryFloat64(warrior.DeepWounds.Dot(target).IsActive(), 2.0, 1.0))
 				damageMod.Activate()
 			}
 		},
@@ -267,7 +262,7 @@ func (warrior *Warrior) applyScarletEnclaveProtection6PBonus() {
 	}
 }
 
-// If Cleave hits fewer than its maximum number of targets, it deals 35% more damage for each unused bounce.
+// If Cleave hits fewer than its maximum number of targets, it deals 25% more damage for each unused bounce.
 func (warrior *Warrior) ApplyFallenRegalityWarriorBonus(aura *core.Aura) {
 	targetCount := warrior.Env.GetNumTargets()
 
@@ -280,7 +275,7 @@ func (warrior *Warrior) ApplyFallenRegalityWarriorBonus(aura *core.Aura) {
 	aura.ApplyOnGain(func(aura *core.Aura, sim *core.Simulation) {
 		cleaveDamageMod.Activate()
 		// The cleave target count is set during initializing, so set the value here
-		cleaveDamageMod.UpdateFloatValue(1 + float64(warrior.CleaveTargetCount-targetCount)*0.35)
+		cleaveDamageMod.UpdateFloatValue(1 + float64(warrior.CleaveTargetCount-targetCount)*0.25)
 	}).ApplyOnExpire(func(aura *core.Aura, sim *core.Simulation) {
 		cleaveDamageMod.Activate()
 	})
diff --git a/sim/warrior/runes.go b/sim/warrior/runes.go
index 36be80e591..125f3954e9 100644
--- a/sim/warrior/runes.go
+++ b/sim/warrior/runes.go
@@ -188,10 +188,10 @@ func (warrior *Warrior) applyFrenziedAssault() {
 		Label:    "Frenzied Assault",
 		Duration: core.NeverExpires,
 		OnGain: func(aura *core.Aura, sim *core.Simulation) {
-			warrior.MultiplyMeleeSpeed(sim, 1.4)
+			warrior.MultiplyMeleeSpeed(sim, 1.35)
 		},
 		OnExpire: func(aura *core.Aura, sim *core.Simulation) {
-			warrior.MultiplyMeleeSpeed(sim, 1/1.4)
+			warrior.MultiplyMeleeSpeed(sim, 1/1.35)
 		},
 		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 			if spell.ProcMask.Matches(core.ProcMaskWhiteHit) && result.Landed() {
diff --git a/tools/database/overrides.go b/tools/database/overrides.go
index caf10a1022..82b2f3fb56 100644
--- a/tools/database/overrides.go
+++ b/tools/database/overrides.go
@@ -4,6 +4,7 @@ import (
 	"regexp"
 
 	"github.com/wowsims/sod/sim/core/proto"
+	"github.com/wowsims/sod/sim/core/stats"
 )
 
 var OtherItemIdsToFetch = []string{}
@@ -90,6 +91,10 @@ var ItemOverrides = []*proto.UIItem{
 		{Source: &proto.UIItemSource_Quest{Quest: &proto.QuestSource{Id: 82081, Name: "A Broken Ritual"}}},
 		{Source: &proto.UIItemSource_Quest{Quest: &proto.QuestSource{Id: 82083, Name: "A Broken Ritual"}}},
 	}},
+
+	// TODO: Remove once we update tooltips
+	{Id: 240925, Stats: stats.Stats{stats.Agility: 10, stats.Stamina: 10}.ToFloatArray()},
+	{Id: 240837, Stats: stats.Stats{stats.Agility: 21, stats.MeleeCrit: 1, stats.SpellCrit: 1}.ToFloatArray(), WeaponDamageMin: 177, WeaponDamageMax: 330, WeaponSpeed: 3.6},
 }
 
 // Keep these sorted by item ID.