diff --git a/sim/core/buffs.go b/sim/core/buffs.go
index 5e743f5f5..63223c35f 100644
--- a/sim/core/buffs.go
+++ b/sim/core/buffs.go
@@ -1422,7 +1422,8 @@ func BattleShoutAura(unit *Unit, impBattleShout int32, boomingVoicePts int32) *A
 }
 
 func TrueshotAura(unit *Unit) *Aura {
-	rangedAP := 200.0
+	rangedAP := 100.0
+	meleeAP := 100.0
 
 	aura := MakePermanent(unit.RegisterAura(Aura{
 		Label:    "Trueshot Aura",
@@ -1432,7 +1433,8 @@ func TrueshotAura(unit *Unit) *Aura {
 	makeExclusiveBuff(aura, BuffConfig{
 		Category: "TrueshotAura",
 		Stats: []StatConfig{
-			{stats.RangedAttackPower, rangedAP, false},
+			{stats.AttackPower, rangedAP, false},
+			{stats.RangedAttackPower, meleeAP, false},
 		},
 	})
 
diff --git a/sim/core/debuffs.go b/sim/core/debuffs.go
index 76506b53a..71e8b36d5 100644
--- a/sim/core/debuffs.go
+++ b/sim/core/debuffs.go
@@ -179,40 +179,13 @@ func applyDebuffEffects(target *Unit, targetIdx int, debuffs *proto.Debuffs, rai
 }
 
 func StormstrikeAura(unit *Unit) *Aura {
-	return exclusiveNatureDamageTakenAura(unit, "Stormstrike", ActionID{SpellID: 17364})
-}
-
-func DreamstateAura(unit *Unit) *Aura {
-	aura := exclusiveNatureDamageTakenAura(unit, "Dreamstate", ActionID{SpellID: 408258})
-	aura.NewExclusiveEffect("ArcaneDamageTaken", false, ExclusiveEffect{
-		Priority: 20,
-		OnGain: func(ee *ExclusiveEffect, sim *Simulation) {
-			aura.Unit.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexArcane] *= 1.2
-		},
-		OnExpire: func(ee *ExclusiveEffect, sim *Simulation) {
-			aura.Unit.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexArcane] /= 1.2
-		},
-	})
-	return aura
-}
-
-func exclusiveNatureDamageTakenAura(unit *Unit, label string, actionID ActionID) *Aura {
 	aura := unit.GetOrRegisterAura(Aura{
-		Label:    label,
-		ActionID: actionID,
+		Label:    "Stormstrike",
+		ActionID: ActionID{SpellID: 17364},
 		Duration: time.Second * 12,
 	})
 
-	aura.NewExclusiveEffect("NatureDamageTaken", false, ExclusiveEffect{
-		Priority: 20,
-		OnGain: func(ee *ExclusiveEffect, sim *Simulation) {
-			aura.Unit.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexNature] *= 1.2
-		},
-		OnExpire: func(ee *ExclusiveEffect, sim *Simulation) {
-			aura.Unit.PseudoStats.SchoolDamageTakenMultiplier[stats.SchoolIndexNature] /= 1.2
-		},
-	})
-
+	//Needs updating to classic version
 	return aura
 }
 
diff --git a/sim/druid/balance/TestP1Balance.results b/sim/druid/balance/TestP1Balance.results
index d0e84b2ea..1fc609c02 100644
--- a/sim/druid/balance/TestP1Balance.results
+++ b/sim/druid/balance/TestP1Balance.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 28.1582
   final_stats: 0
   final_stats: 0
-  final_stats: 1130.5
+  final_stats: 1230.5
   final_stats: 0
   final_stats: 24.595
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 1989.8
-  final_stats: 566
+  final_stats: 466
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -53,9 +53,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.0447
+  weights: 0.03725
   weights: 0
-  weights: 0.59211
+  weights: 0.49343
   weights: 0
   weights: 0
   weights: 0
@@ -63,8 +63,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 3.8561
-  weights: 3.03194
+  weights: 3.21342
+  weights: 2.52661
   weights: 0
   weights: 0
   weights: 0
@@ -99,29 +99,29 @@ stat_weights_results: {
 dps_results: {
  key: "TestP1Balance-Phase1-Average-Default"
  value: {
-  dps: 276.73234
-  tps: 290.20972
+  dps: 230.68705
+  tps: 244.16444
  }
 }
 dps_results: {
  key: "TestP1Balance-Phase1-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 274.9889
-  tps: 517.73713
+  dps: 229.15741
+  tps: 471.90565
  }
 }
 dps_results: {
  key: "TestP1Balance-Phase1-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 274.9889
-  tps: 287.12631
+  dps: 229.15741
+  tps: 241.29483
  }
 }
 dps_results: {
  key: "TestP1Balance-Phase1-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 264.64341
-  tps: 273.23404
+  dps: 220.53617
+  tps: 229.12681
  }
 }
 dps_results: {
@@ -148,22 +148,22 @@ dps_results: {
 dps_results: {
  key: "TestP1Balance-Phase1-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 273.10499
-  tps: 540.13513
+  dps: 227.58749
+  tps: 494.61763
  }
 }
 dps_results: {
  key: "TestP1Balance-Phase1-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 273.10499
-  tps: 286.45649
+  dps: 227.58749
+  tps: 240.939
  }
 }
 dps_results: {
  key: "TestP1Balance-Phase1-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 262.72716
-  tps: 271.34635
+  dps: 218.9393
+  tps: 227.55849
  }
 }
 dps_results: {
@@ -190,7 +190,7 @@ dps_results: {
 dps_results: {
  key: "TestP1Balance-Phase1-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 274.1419
-  tps: 287.5591
+  dps: 228.50071
+  tps: 241.9179
  }
 }
diff --git a/sim/druid/feral/TestP1Feral.results b/sim/druid/feral/TestP1Feral.results
index 0da9afb9d..6253e5997 100644
--- a/sim/druid/feral/TestP1Feral.results
+++ b/sim/druid/feral/TestP1Feral.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 29.22983
   final_stats: 0
   final_stats: 0
-  final_stats: 1860.05
+  final_stats: 1960.05
   final_stats: 0
   final_stats: 34.0325
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 2047.3
-  final_stats: 606
+  final_stats: 506
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -51,7 +51,7 @@ stat_weights_results: {
  key: "TestP1Feral-Phase1-StatWeights-Default"
  value: {
   weights: 0.48677
-  weights: 0.52911
+  weights: 0.53996
   weights: 0
   weights: 0
   weights: 0
@@ -69,7 +69,7 @@ stat_weights_results: {
   weights: 0
   weights: 0.17636
   weights: 0
-  weights: 4.82544
+  weights: 4.98956
   weights: 0
   weights: 0
   weights: 0
@@ -99,29 +99,29 @@ stat_weights_results: {
 dps_results: {
  key: "TestP1Feral-Phase1-Average-Default"
  value: {
-  dps: 532.0327
-  tps: 377.74322
+  dps: 549.69111
+  tps: 390.28068
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-NightElf-p0.bis-Default-NoBleed-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 241.04973
-  tps: 171.14531
+  dps: 247.69177
+  tps: 175.86116
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-NightElf-p0.bis-Default-NoBleed-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 226.1911
-  tps: 160.59568
+  dps: 232.83313
+  tps: 165.31152
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-NightElf-p0.bis-Default-NoBleed-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 256.25551
-  tps: 181.94141
+  dps: 263.7748
+  tps: 187.28011
  }
 }
 dps_results: {
@@ -148,22 +148,22 @@ dps_results: {
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 241.04973
-  tps: 171.14531
+  dps: 247.69177
+  tps: 175.86116
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 226.1911
-  tps: 160.59568
+  dps: 232.83313
+  tps: 165.31152
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-NightElf-p0.bis-Default-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 256.25551
-  tps: 181.94141
+  dps: 263.7748
+  tps: 187.28011
  }
 }
 dps_results: {
@@ -190,22 +190,22 @@ dps_results: {
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-NightElf-p0.bis-Flower-Aoe-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 241.04973
-  tps: 171.14531
+  dps: 247.69177
+  tps: 175.86116
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-NightElf-p0.bis-Flower-Aoe-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 226.1911
-  tps: 160.59568
+  dps: 232.83313
+  tps: 165.31152
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-NightElf-p0.bis-Flower-Aoe-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 256.25551
-  tps: 181.94141
+  dps: 263.7748
+  tps: 187.28011
  }
 }
 dps_results: {
@@ -232,22 +232,22 @@ dps_results: {
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-Tauren-p0.bis-Default-NoBleed-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 252.42707
-  tps: 179.22322
+  dps: 259.26357
+  tps: 184.07713
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-Tauren-p0.bis-Default-NoBleed-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 237.61834
-  tps: 168.70902
+  dps: 244.45484
+  tps: 173.56294
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-Tauren-p0.bis-Default-NoBleed-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 269.7831
-  tps: 191.546
+  dps: 277.54006
+  tps: 197.05344
  }
 }
 dps_results: {
@@ -274,22 +274,22 @@ dps_results: {
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 252.42707
-  tps: 179.22322
+  dps: 259.26357
+  tps: 184.07713
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 237.61834
-  tps: 168.70902
+  dps: 244.45484
+  tps: 173.56294
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-Tauren-p0.bis-Default-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 269.7831
-  tps: 191.546
+  dps: 277.54006
+  tps: 197.05344
  }
 }
 dps_results: {
@@ -316,22 +316,22 @@ dps_results: {
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-Tauren-p0.bis-Flower-Aoe-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 252.42707
-  tps: 179.22322
+  dps: 259.26357
+  tps: 184.07713
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-Tauren-p0.bis-Flower-Aoe-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 237.61834
-  tps: 168.70902
+  dps: 244.45484
+  tps: 173.56294
  }
 }
 dps_results: {
  key: "TestP1Feral-Phase1-Settings-Tauren-p0.bis-Flower-Aoe-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 269.7831
-  tps: 191.546
+  dps: 277.54006
+  tps: 197.05344
  }
 }
 dps_results: {
@@ -358,7 +358,7 @@ dps_results: {
 dps_results: {
  key: "TestP1Feral-Phase1-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 224.69834
-  tps: 159.53582
+  dps: 233.1429
+  tps: 165.53146
  }
 }
diff --git a/sim/druid/runes.go b/sim/druid/runes.go
index ea9cd83e5..8a19cc882 100644
--- a/sim/druid/runes.go
+++ b/sim/druid/runes.go
@@ -293,9 +293,6 @@ func (druid *Druid) applyDreamstate() {
 		return
 	}
 
-	dreamstateAuras := druid.NewEnemyAuraArray(func(target *core.Unit) *core.Aura {
-		return core.DreamstateAura(target)
-	})
 
 	druid.DreamstateManaRegenAura = druid.RegisterAura(core.Aura{
 		Label:    "Dreamstate Mana Regen",
@@ -314,7 +311,6 @@ func (druid *Druid) applyDreamstate() {
 		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 			if spell.ProcMask.Matches(core.ProcMaskSpellDamage) && result.DidCrit() || spell.SpellCode == SpellCode_DruidStarsurge {
 				druid.DreamstateManaRegenAura.Activate(sim)
-				dreamstateAuras.Get(result.Target).Activate(sim)
 			}
 		},
 	}))
diff --git a/sim/hunter/TestP1Hunter.results b/sim/hunter/TestP1Hunter.results
index d07437455..88cf138c5 100644
--- a/sim/hunter/TestP1Hunter.results
+++ b/sim/hunter/TestP1Hunter.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 28.19007
   final_stats: 0
   final_stats: 0
-  final_stats: 1608.215
+  final_stats: 1708.215
   final_stats: 3
   final_stats: 31.65903
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 3269.12
-  final_stats: 1842.12
+  final_stats: 1742.12
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -51,7 +51,7 @@ stat_weights_results: {
  key: "TestP1Hunter-Phase1-StatWeights-Default"
  value: {
   weights: 0
-  weights: 0.24963
+  weights: 0.25139
   weights: 0
   weights: 0
   weights: 0
@@ -68,8 +68,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0.09121
-  weights: 6.41219
-  weights: 1.94634
+  weights: 6.72298
+  weights: 2.05704
   weights: 0
   weights: 0
   weights: 0
@@ -99,40 +99,40 @@ stat_weights_results: {
 dps_results: {
  key: "TestP1Hunter-Phase1-AllItems-DevilsaurEye-19991"
  value: {
-  dps: 489.82502
-  tps: 162.17542
+  dps: 513.69739
+  tps: 171.31465
  }
 }
 dps_results: {
  key: "TestP1Hunter-Phase1-AllItems-DevilsaurTooth-19992"
  value: {
-  dps: 484.62839
-  tps: 158.77881
+  dps: 508.43816
+  tps: 167.88138
  }
 }
 dps_results: {
  key: "TestP1Hunter-Phase1-Average-Default"
  value: {
-  dps: 480.44853
-  tps: 158.24333
+  dps: 504.08906
+  tps: 167.32736
  }
 }
 dps_results: {
  key: "TestP1Hunter-Phase1-Settings-Dwarf-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 306.62703
+  dps: 320.29783
  }
 }
 dps_results: {
  key: "TestP1Hunter-Phase1-Settings-Dwarf-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 306.62703
+  dps: 320.29783
  }
 }
 dps_results: {
  key: "TestP1Hunter-Phase1-Settings-Dwarf-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 322.04073
+  dps: 336.34664
  }
 }
 dps_results: {
@@ -156,19 +156,19 @@ dps_results: {
 dps_results: {
  key: "TestP1Hunter-Phase1-Settings-Orc-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 323.79656
+  dps: 338.41474
  }
 }
 dps_results: {
  key: "TestP1Hunter-Phase1-Settings-Orc-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 323.79656
+  dps: 338.41474
  }
 }
 dps_results: {
  key: "TestP1Hunter-Phase1-Settings-Orc-p0.bis-Hunter-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 340.77728
+  dps: 356.10147
  }
 }
 dps_results: {
@@ -192,7 +192,7 @@ dps_results: {
 dps_results: {
  key: "TestP1Hunter-Phase1-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 460.70358
-  tps: 136.242
+  dps: 483.14004
+  tps: 144.02958
  }
 }
diff --git a/sim/mage/TestP1Mage.results b/sim/mage/TestP1Mage.results
index 8f5307709..92b0c8249 100644
--- a/sim/mage/TestP1Mage.results
+++ b/sim/mage/TestP1Mage.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 28.1552
   final_stats: 0
   final_stats: 0
-  final_stats: 792.5
+  final_stats: 892.5
   final_stats: 0
   final_stats: 16.2
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 1049.8
-  final_stats: 540
+  final_stats: 440
   final_stats: 0
   final_stats: 5
   final_stats: 0
diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results
index 2383fc973..1c04dd0ea 100644
--- a/sim/paladin/protection/TestProtection.results
+++ b/sim/paladin/protection/TestProtection.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 27.28857
   final_stats: 0
   final_stats: 0
-  final_stats: 1522.58
+  final_stats: 1622.58
   final_stats: 3
   final_stats: 28.44509
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 690.13
-  final_stats: 580
+  final_stats: 480
   final_stats: 10
   final_stats: 5.4
   final_stats: 0
@@ -51,7 +51,7 @@ stat_weights_results: {
  key: "TestProtection-Phase4-StatWeights-Default"
  value: {
   weights: 0.42023
-  weights: 0.1565
+  weights: 0.16678
   weights: 0
   weights: 0
   weights: 0
@@ -68,9 +68,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0.1661
-  weights: 3.45098
-  weights: 2.44185
-  weights: 2.5538
+  weights: 3.66847
+  weights: 2.60222
+  weights: 2.71125
   weights: 0
   weights: 0
   weights: 0
@@ -99,36 +99,36 @@ stat_weights_results: {
 dps_results: {
  key: "TestProtection-Phase4-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 342.44986
-  tps: 520.78354
+  dps: 359.10808
+  tps: 543.16151
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Average-Default"
  value: {
-  dps: 342.58051
-  tps: 520.22766
+  dps: 359.20486
+  tps: 542.52946
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 52.46751
-  tps: 111.97009
+  dps: 53.31731
+  tps: 113.5847
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 33.71315
-  tps: 64.54703
+  dps: 34.56316
+  tps: 66.16205
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Settings-Dwarf-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 108.8327
-  tps: 207.60092
+  dps: 109.91354
+  tps: 209.65452
  }
 }
 dps_results: {
@@ -155,22 +155,22 @@ dps_results: {
 dps_results: {
  key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 53.98205
-  tps: 113.45323
+  dps: 54.81995
+  tps: 115.04524
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 33.95535
-  tps: 64.93299
+  dps: 34.79297
+  tps: 66.52446
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Settings-Human-blank-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 108.778
-  tps: 207.497
+  dps: 109.85885
+  tps: 209.55061
  }
 }
 dps_results: {
@@ -197,7 +197,7 @@ dps_results: {
 dps_results: {
  key: "TestProtection-Phase4-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 294.68649
-  tps: 450.04044
+  dps: 308.33005
+  tps: 467.97997
  }
 }
diff --git a/sim/paladin/retribution/TestExodin.results b/sim/paladin/retribution/TestExodin.results
index f942af93c..05cb1317f 100644
--- a/sim/paladin/retribution/TestExodin.results
+++ b/sim/paladin/retribution/TestExodin.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 27.28857
   final_stats: 0
   final_stats: 0
-  final_stats: 1569.638
+  final_stats: 1669.638
   final_stats: 3
   final_stats: 28.44509
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 690.13
-  final_stats: 580
+  final_stats: 480
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -51,7 +51,7 @@ stat_weights_results: {
  key: "TestExodin-Phase5-StatWeights-Default"
  value: {
   weights: 0.45025
-  weights: 0.17253
+  weights: 0.18208
   weights: 0
   weights: 0
   weights: 0
@@ -63,13 +63,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.21086
-  weights: 0.09327
+  weights: 0.2108
+  weights: 0.09336
   weights: 0
   weights: 0
   weights: 0.16179
-  weights: 4.12735
-  weights: 3.15739
+  weights: 4.32983
+  weights: 3.32152
   weights: 0
   weights: 0
   weights: 0
@@ -99,29 +99,29 @@ stat_weights_results: {
 dps_results: {
  key: "TestExodin-Phase5-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 343.25189
-  tps: 379.99092
+  dps: 359.54902
+  tps: 396.36087
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Average-Default"
  value: {
-  dps: 341.00857
-  tps: 377.78962
+  dps: 357.20747
+  tps: 394.05402
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 23.73187
-  tps: 218.44203
+  dps: 24.30242
+  tps: 219.01258
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 9.77042
-  tps: 19.50593
+  dps: 10.34057
+  tps: 20.07607
  }
 }
 dps_results: {
@@ -154,15 +154,15 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 24.37801
-  tps: 218.49817
+  dps: 24.93099
+  tps: 219.05115
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 9.52211
-  tps: 19.22812
+  dps: 10.07469
+  tps: 19.7807
  }
 }
 dps_results: {
@@ -195,7 +195,7 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase5-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 280.00112
-  tps: 314.34057
+  dps: 293.1927
+  tps: 327.73719
  }
 }
diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results
index 36c223586..852000ed4 100644
--- a/sim/paladin/retribution/TestRetribution.results
+++ b/sim/paladin/retribution/TestRetribution.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 27.28857
   final_stats: 0
   final_stats: 0
-  final_stats: 1569.638
+  final_stats: 1669.638
   final_stats: 3
   final_stats: 28.44509
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 690.13
-  final_stats: 580
+  final_stats: 480
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -50,12 +50,12 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestRetribution-Phase5-StatWeights-Default"
  value: {
-  weights: 0.4796
-  weights: 0.19206
+  weights: 0.47752
+  weights: 0.20483
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.14806
+  weights: 0.14805
   weights: 0
   weights: 0
   weights: 0
@@ -63,13 +63,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.94099
-  weights: 0.09473
+  weights: 0.92817
+  weights: 0.09469
   weights: 0
   weights: 0
-  weights: 0.17157
-  weights: 3.6531
-  weights: 3.22265
+  weights: 0.17159
+  weights: 3.91186
+  weights: 3.38837
   weights: 0
   weights: 0
   weights: 0
@@ -99,36 +99,36 @@ stat_weights_results: {
 dps_results: {
  key: "TestRetribution-Phase5-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 350.60821
-  tps: 389.36628
+  dps: 368.02692
+  tps: 407.07106
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Average-Default"
  value: {
-  dps: 348.61173
-  tps: 387.0455
+  dps: 365.79659
+  tps: 404.39942
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 51.23529
-  tps: 259.81044
+  dps: 51.97442
+  tps: 260.54958
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 31.78148
-  tps: 42.23973
+  dps: 32.50663
+  tps: 42.96489
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 39.30049
-  tps: 56.1805
+  dps: 40.78432
+  tps: 57.66433
  }
 }
 dps_results: {
@@ -155,22 +155,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 17.25277
-  tps: 203.11293
+  dps: 17.33768
+  tps: 203.19784
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 15.31063
-  tps: 24.60364
+  dps: 15.39461
+  tps: 24.68762
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Settings-Dwarf-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 16.74577
-  tps: 32.24911
+  dps: 16.90708
+  tps: 32.41042
  }
 }
 dps_results: {
@@ -197,22 +197,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 47.73755
-  tps: 256.31271
+  dps: 48.54166
+  tps: 257.11682
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 28.93588
-  tps: 39.37938
+  dps: 29.75
+  tps: 40.19351
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 39.2179
-  tps: 56.09791
+  dps: 40.70173
+  tps: 57.58174
  }
 }
 dps_results: {
@@ -239,22 +239,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 17.35846
-  tps: 203.21861
+  dps: 17.44336
+  tps: 203.30352
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 15.41637
-  tps: 24.70938
+  dps: 15.50035
+  tps: 24.79336
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Settings-Human-blank-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 16.73679
-  tps: 32.24013
+  dps: 16.8981
+  tps: 32.40144
  }
 }
 dps_results: {
@@ -281,7 +281,7 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase5-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 292.56423
-  tps: 327.6184
+  dps: 306.50054
+  tps: 341.77572
  }
 }
diff --git a/sim/paladin/retribution/TestShockadin.results b/sim/paladin/retribution/TestShockadin.results
index 0c2e4f196..5fa79dc75 100644
--- a/sim/paladin/retribution/TestShockadin.results
+++ b/sim/paladin/retribution/TestShockadin.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 27.56742
   final_stats: 0
   final_stats: 0
-  final_stats: 1569.638
+  final_stats: 1669.638
   final_stats: 0
   final_stats: 28.44509
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 690.13
-  final_stats: 580
+  final_stats: 480
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -51,7 +51,7 @@ stat_weights_results: {
  key: "TestShockadin-Phase5-StatWeights-Default"
  value: {
   weights: 0.28168
-  weights: 0.14171
+  weights: 0.14833
   weights: 0
   weights: 0
   weights: 0
@@ -63,13 +63,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 2.02698
+  weights: 2.02814
   weights: 0.38293
   weights: 0
   weights: 0
   weights: 0.10121
   weights: 0
-  weights: 2.44932
+  weights: 2.55349
   weights: 0
   weights: 0
   weights: 0
@@ -99,15 +99,15 @@ stat_weights_results: {
 dps_results: {
  key: "TestShockadin-Phase5-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 442.30805
-  tps: 484.28706
+  dps: 452.41975
+  tps: 494.39876
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Average-Default"
  value: {
-  dps: 441.08284
-  tps: 483.07191
+  dps: 451.16907
+  tps: 493.15815
  }
 }
 dps_results: {
@@ -197,7 +197,7 @@ dps_results: {
 dps_results: {
  key: "TestShockadin-Phase5-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 396.91084
-  tps: 436.37743
+  dps: 405.621
+  tps: 445.08759
  }
 }
diff --git a/sim/priest/shadow/TestP1Shadow.results b/sim/priest/shadow/TestP1Shadow.results
index 5942e64d3..3ce3e6399 100644
--- a/sim/priest/shadow/TestP1Shadow.results
+++ b/sim/priest/shadow/TestP1Shadow.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 29.17096
   final_stats: 0
   final_stats: 0
-  final_stats: 800.55
+  final_stats: 900.55
   final_stats: 0
   final_stats: 16
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 879.3
-  final_stats: 540
+  final_stats: 440
   final_stats: 0
   final_stats: 5
   final_stats: 0
diff --git a/sim/rogue/dps_rogue/TestCombatDaggers.results b/sim/rogue/dps_rogue/TestCombatDaggers.results
index 9e33c7336..395ed1881 100644
--- a/sim/rogue/dps_rogue/TestCombatDaggers.results
+++ b/sim/rogue/dps_rogue/TestCombatDaggers.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 21
   final_stats: 0
   final_stats: 0
-  final_stats: 1944.23
+  final_stats: 2044.23
   final_stats: 9
   final_stats: 46.27865
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 2348.69
-  final_stats: 1267.845
+  final_stats: 1167.845
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -51,7 +51,7 @@ stat_weights_results: {
  key: "TestCombatDaggers-Phase5-StatWeights-Default"
  value: {
   weights: 0.41497
-  weights: 0.54098
+  weights: 0.54429
   weights: 0
   weights: 0
   weights: 0
@@ -68,8 +68,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0.32804
-  weights: 12.8478
-  weights: 2.02067
+  weights: 13.28118
+  weights: 2.07433
   weights: 0
   weights: 0
   weights: 0
@@ -99,71 +99,71 @@ stat_weights_results: {
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-BloodfangArmor"
  value: {
-  dps: 1009.62052
-  tps: 716.83057
+  dps: 1038.12369
+  tps: 737.06782
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-BonescytheArmor"
  value: {
-  dps: 1109.55984
-  tps: 769.12965
+  dps: 1140.80594
+  tps: 790.84922
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-DarkmantleArmor"
  value: {
-  dps: 1006.36103
-  tps: 714.51633
+  dps: 1036.12069
+  tps: 735.64569
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-Deathdealer'sEmbrace"
  value: {
-  dps: 1013.45945
-  tps: 719.55621
+  dps: 1043.30626
+  tps: 740.74744
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-Madcap'sOutfit"
  value: {
-  dps: 945.37078
-  tps: 671.21325
+  dps: 973.63605
+  tps: 691.2816
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-NightslayerArmor"
  value: {
-  dps: 955.51312
-  tps: 678.41432
+  dps: 984.70563
+  tps: 699.141
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Average-Default"
  value: {
-  dps: 954.76353
-  tps: 677.88211
+  dps: 983.34249
+  tps: 698.17317
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 348.40198
-  tps: 247.3654
+  dps: 357.66538
+  tps: 253.94242
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 292.75398
-  tps: 207.85532
+  dps: 300.54322
+  tps: 213.38569
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 369.14674
-  tps: 262.09418
+  dps: 378.95622
+  tps: 269.05892
  }
 }
 dps_results: {
@@ -190,22 +190,22 @@ dps_results: {
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 360.49061
-  tps: 255.94833
+  dps: 370.10695
+  tps: 262.77593
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 294.19819
-  tps: 208.88071
+  dps: 302.11662
+  tps: 214.5028
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 377.7942
-  tps: 268.23388
+  dps: 387.82729
+  tps: 275.35737
  }
 }
 dps_results: {
@@ -232,7 +232,7 @@ dps_results: {
 dps_results: {
  key: "TestCombatDaggers-Phase5-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 347.28483
-  tps: 246.57223
+  dps: 357.7602
+  tps: 254.00974
  }
 }
diff --git a/sim/rogue/dps_rogue/TestCombatSinisterStrike.results b/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
index 2aa546741..ec542740f 100644
--- a/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
+++ b/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 21
   final_stats: 0
   final_stats: 0
-  final_stats: 1914.23
+  final_stats: 2014.23
   final_stats: 9
   final_stats: 41.27865
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 2448.69
-  final_stats: 1237.845
+  final_stats: 1137.845
   final_stats: 7
   final_stats: 5.28
   final_stats: 0
@@ -51,7 +51,7 @@ stat_weights_results: {
  key: "TestCombatSinisterStrike-Phase5-StatWeights-Default"
  value: {
   weights: 0.44874
-  weights: 0.82475
+  weights: 0.83752
   weights: 0
   weights: 0
   weights: 0
@@ -68,8 +68,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0.35474
-  weights: 8.17536
-  weights: 8.05638
+  weights: 8.43574
+  weights: 8.35145
   weights: 0
   weights: 0
   weights: 0
@@ -99,71 +99,71 @@ stat_weights_results: {
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-BloodfangArmor"
  value: {
-  dps: 1067.43349
-  tps: 757.87777
+  dps: 1100.44199
+  tps: 781.31381
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-BonescytheArmor"
  value: {
-  dps: 1180.69658
-  tps: 820.9058
+  dps: 1217.0365
+  tps: 846.22433
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-DarkmantleArmor"
  value: {
-  dps: 1065.06467
-  tps: 756.19591
+  dps: 1099.67152
+  tps: 780.76678
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-Deathdealer'sEmbrace"
  value: {
-  dps: 1077.02426
-  tps: 764.68722
+  dps: 1111.45885
+  tps: 789.13578
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-Madcap'sOutfit"
  value: {
-  dps: 1006.44795
-  tps: 714.57805
+  dps: 1039.70153
+  tps: 738.18809
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-NightslayerArmor"
  value: {
-  dps: 1008.22637
-  tps: 715.84073
+  dps: 1041.85136
+  tps: 739.71446
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Average-Default"
  value: {
-  dps: 992.95715
-  tps: 704.99957
+  dps: 1025.26005
+  tps: 727.93464
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 322.28896
-  tps: 228.82516
+  dps: 331.67889
+  tps: 235.49201
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 267.39619
-  tps: 189.8513
+  dps: 275.19332
+  tps: 195.38725
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 333.11694
-  tps: 236.51303
+  dps: 342.94882
+  tps: 243.49366
  }
 }
 dps_results: {
@@ -190,22 +190,22 @@ dps_results: {
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 326.44203
-  tps: 231.77384
+  dps: 336.01651
+  tps: 238.57172
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 266.2105
-  tps: 189.00946
+  dps: 274.09066
+  tps: 194.60437
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 337.26431
-  tps: 239.45766
+  dps: 347.23319
+  tps: 246.53556
  }
 }
 dps_results: {
@@ -232,7 +232,7 @@ dps_results: {
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 774.37785
-  tps: 549.80828
+  dps: 799.10279
+  tps: 567.36298
  }
 }
diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
index ea258033b..0db1fd157 100644
--- a/sim/shaman/elemental/TestElemental.results
+++ b/sim/shaman/elemental/TestElemental.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 26.37073
   final_stats: 0
   final_stats: 0
-  final_stats: 1201.5
+  final_stats: 1301.5
   final_stats: 3
   final_stats: 24.98192
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 788.8
-  final_stats: 540
+  final_stats: 440
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -53,18 +53,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.86028
+  weights: 0.71989
   weights: 0
-  weights: 0.59438
+  weights: 0.51092
   weights: 0
   weights: 0.09364
   weights: 0
   weights: 0
-  weights: 0.50074
+  weights: 0.41728
   weights: 0
   weights: 0
-  weights: 5.93443
-  weights: 3.03883
+  weights: 5.03315
+  weights: 2.59396
   weights: 0
   weights: 0
   weights: 0
@@ -99,29 +99,29 @@ stat_weights_results: {
 dps_results: {
  key: "TestElemental-Phase5-Average-Default"
  value: {
-  dps: 478.77965
-  tps: 490.85611
+  dps: 420.87152
+  tps: 432.94799
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Settings-Orc-blank-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 983.4771
-  tps: 1111.34922
+  dps: 936.03114
+  tps: 1063.90326
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Settings-Orc-blank-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 439.16767
-  tps: 447.53686
+  dps: 382.81453
+  tps: 391.18373
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Settings-Orc-blank-Adaptive-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 524.13664
-  tps: 540.06378
+  dps: 455.77318
+  tps: 471.70032
  }
 }
 dps_results: {
@@ -148,22 +148,22 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Phase5-Settings-Troll-blank-Adaptive-phase_5-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 975.21151
-  tps: 1110.72202
+  dps: 927.686
+  tps: 1063.1965
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Settings-Troll-blank-Adaptive-phase_5-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 434.21164
-  tps: 443.04827
+  dps: 378.61527
+  tps: 387.4519
  }
 }
 dps_results: {
  key: "TestElemental-Phase5-Settings-Troll-blank-Adaptive-phase_5-FullBuffs-P5-Consumes-ShortSingleTarget"
  value: {
-  dps: 539.19466
-  tps: 556.15057
+  dps: 468.33804
+  tps: 485.29395
  }
 }
 dps_results: {
@@ -190,7 +190,7 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Phase5-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 479.54777
-  tps: 491.94782
+  dps: 420.79557
+  tps: 433.19562
  }
 }
diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results
index 1590707f8..787dd7634 100644
--- a/sim/shaman/enhancement/TestEnhancement.results
+++ b/sim/shaman/enhancement/TestEnhancement.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 26.17638
   final_stats: 0
   final_stats: 0
-  final_stats: 1333.5
+  final_stats: 1433.5
   final_stats: 0
   final_stats: 33.44242
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 846.3
-  final_stats: 580
+  final_stats: 480
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -51,11 +51,11 @@ stat_weights_results: {
  key: "TestEnhancement-Phase5-StatWeights-Default"
  value: {
   weights: 0.32131
-  weights: 0.19501
+  weights: 0.20869
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.19354
+  weights: 0.18741
   weights: 0
   weights: 0
   weights: 0
@@ -69,7 +69,7 @@ stat_weights_results: {
   weights: 0
   weights: 0.1397
   weights: 0
-  weights: 2.6191
+  weights: 2.81396
   weights: 0
   weights: 0
   weights: 0
@@ -99,182 +99,182 @@ stat_weights_results: {
 dps_results: {
  key: "TestEnhancement-Phase5-Average-Default"
  value: {
-  dps: 374.01064
-  tps: 434.15471
+  dps: 378.24383
+  tps: 428.69557
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 331.93534
-  tps: 1068.48486
+  dps: 300.33108
+  tps: 1031.71766
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 195.05616
-  tps: 252.69329
+  dps: 187.09917
+  tps: 235.18614
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 195.34314
-  tps: 254.50209
+  dps: 188.06437
+  tps: 238.06473
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 150.67655
-  tps: 620.93931
+  dps: 143.87833
+  tps: 611.95677
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 89.89647
-  tps: 115.64539
+  dps: 85.8369
+  tps: 107.52625
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 112.39769
-  tps: 142.61766
+  dps: 106.71035
+  tps: 131.243
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 331.93534
-  tps: 1068.48486
+  dps: 300.33108
+  tps: 1031.71766
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 195.05616
-  tps: 252.69329
+  dps: 187.09917
+  tps: 235.18614
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 195.34314
-  tps: 254.50209
+  dps: 188.06437
+  tps: 238.06473
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 150.67655
-  tps: 620.93931
+  dps: 143.87833
+  tps: 611.95677
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 89.89647
-  tps: 115.64539
+  dps: 85.8369
+  tps: 107.52625
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Orc-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 112.39769
-  tps: 142.61766
+  dps: 106.71035
+  tps: 131.243
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 331.9826
-  tps: 1072.66976
+  dps: 300.35315
+  tps: 1035.78089
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 197.66792
-  tps: 256.84998
+  dps: 189.49522
+  tps: 238.90851
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 195.25667
-  tps: 252.23533
+  dps: 187.9779
+  tps: 235.79797
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 146.66276
-  tps: 608.09518
+  dps: 140.01789
+  tps: 599.28829
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 88.46662
-  tps: 113.50845
+  dps: 84.5013
+  tps: 105.57782
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 112.37858
-  tps: 143.48008
+  dps: 106.69125
+  tps: 132.10542
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 331.9826
-  tps: 1072.66976
+  dps: 300.35315
+  tps: 1035.78089
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 197.66792
-  tps: 256.84998
+  dps: 189.49522
+  tps: 238.90851
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 195.25667
-  tps: 252.23533
+  dps: 187.9779
+  tps: 235.79797
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 146.66276
-  tps: 608.09518
+  dps: 140.01789
+  tps: 599.28829
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 88.46662
-  tps: 113.50845
+  dps: 84.5013
+  tps: 105.57782
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Settings-Troll-blank-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 112.37858
-  tps: 143.48008
+  dps: 106.69125
+  tps: 132.10542
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 334.40718
-  tps: 393.53062
+  dps: 336.24257
+  tps: 385.87724
  }
 }
diff --git a/sim/shaman/warden/TestWardenShaman.results b/sim/shaman/warden/TestWardenShaman.results
index 340670a46..99990fbea 100644
--- a/sim/shaman/warden/TestWardenShaman.results
+++ b/sim/shaman/warden/TestWardenShaman.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 26.17638
   final_stats: 0
   final_stats: 0
-  final_stats: 1333.5
+  final_stats: 1433.5
   final_stats: 0
   final_stats: 33.44242
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 846.3
-  final_stats: 580
+  final_stats: 480
   final_stats: 0
   final_stats: 10
   final_stats: 0
@@ -55,7 +55,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.31539
+  weights: 0.28215
   weights: 0
   weights: 0
   weights: 0
@@ -99,98 +99,98 @@ stat_weights_results: {
 dps_results: {
  key: "TestWardenShaman-Phase4-Average-Default"
  value: {
-  dps: 326.0203
-  tps: 402.23963
+  dps: 310.07097
+  tps: 378.59215
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Settings-Orc-blank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 670.06853
-  tps: 952.45863
+  dps: 653.2614
+  tps: 929.99521
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Settings-Orc-blank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 215.44775
-  tps: 271.2074
+  dps: 197.57732
+  tps: 247.00363
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Settings-Orc-blank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 264.79497
-  tps: 333.16623
+  dps: 243.23569
+  tps: 303.04393
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Settings-Orc-blank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 261.69901
-  tps: 596.83617
+  dps: 257.13962
+  tps: 590.13332
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Settings-Orc-blank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 97.72531
-  tps: 124.94224
+  dps: 89.00918
+  tps: 113.81049
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Settings-Orc-blank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 160.86839
-  tps: 206.39957
+  dps: 145.96834
+  tps: 186.5819
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Settings-Troll-blank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 661.27309
-  tps: 940.35417
+  dps: 644.55529
+  tps: 918.82807
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Settings-Troll-blank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 209.0216
-  tps: 267.40895
+  dps: 191.24349
+  tps: 243.08363
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Settings-Troll-blank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 279.51484
-  tps: 357.68581
+  dps: 254.90517
+  tps: 323.04576
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Settings-Troll-blank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 249.44591
-  tps: 594.67489
+  dps: 245.04873
+  tps: 588.18977
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Settings-Troll-blank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 95.9338
-  tps: 120.83474
+  dps: 87.34762
+  tps: 110.08081
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Settings-Troll-blank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 151.80274
-  tps: 197.09888
+  dps: 137.24951
+  tps: 177.33886
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 303.41385
-  tps: 377.02356
+  dps: 286.3191
+  tps: 352.46136
  }
 }
diff --git a/sim/warlock/dps/TestWarlockDSRuin.results b/sim/warlock/dps/TestWarlockDSRuin.results
index 93d166afb..40183b275 100644
--- a/sim/warlock/dps/TestWarlockDSRuin.results
+++ b/sim/warlock/dps/TestWarlockDSRuin.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 32.35455
   final_stats: 0
   final_stats: 0
-  final_stats: 815.5
+  final_stats: 915.5
   final_stats: 0
   final_stats: 24.7175
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 1974.7
-  final_stats: 540
+  final_stats: 440
   final_stats: 0
   final_stats: 5
   final_stats: 0
diff --git a/sim/warlock/dps/TestWarlockSMRuin.results b/sim/warlock/dps/TestWarlockSMRuin.results
index e1d83414f..aeff303ab 100644
--- a/sim/warlock/dps/TestWarlockSMRuin.results
+++ b/sim/warlock/dps/TestWarlockSMRuin.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 32.35455
   final_stats: 0
   final_stats: 0
-  final_stats: 815.5
+  final_stats: 915.5
   final_stats: 0
   final_stats: 24.7175
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 1974.7
-  final_stats: 540
+  final_stats: 440
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -99,84 +99,84 @@ stat_weights_results: {
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-AllItems-Champion'sDreadgear"
  value: {
-  dps: 1120.15378
+  dps: 1129.99018
   tps: 954.62077
  }
 }
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-AllItems-Demoniac'sThreads"
  value: {
-  dps: 1087.59094
+  dps: 1097.42734
   tps: 921.27125
  }
 }
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-AllItems-Doomcaller'sAttire"
  value: {
-  dps: 1161.38047
+  dps: 1171.31024
   tps: 988.0248
  }
 }
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-AllItems-FelheartRaiment"
  value: {
-  dps: 1068.47174
+  dps: 1078.30814
   tps: 903.79542
  }
 }
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-AllItems-FieldMarshal'sThreads"
  value: {
-  dps: 1147.66223
+  dps: 1157.49863
   tps: 978.10093
  }
 }
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-AllItems-LieutenantCommander'sDreadgear"
  value: {
-  dps: 1120.15378
+  dps: 1129.99018
   tps: 954.62077
  }
 }
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-AllItems-NemesisRaiment"
  value: {
-  dps: 1130.80862
+  dps: 1140.64502
   tps: 961.2941
  }
 }
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-AllItems-Warlord'sThreads"
  value: {
-  dps: 1147.66223
+  dps: 1157.49863
   tps: 978.10093
  }
 }
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-Average-Default"
  value: {
-  dps: 1129.99612
+  dps: 1139.81765
   tps: 961.60162
  }
 }
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-Settings-Orc-mc-SM/Ruin Warlock-rotation-FullBuffs-Consumes-LongMultiTarget"
  value: {
-  dps: 1120.04081
+  dps: 1129.89471
   tps: 2088.08366
  }
 }
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-Settings-Orc-mc-SM/Ruin Warlock-rotation-FullBuffs-Consumes-LongSingleTarget"
  value: {
-  dps: 1120.04081
+  dps: 1129.89471
   tps: 950.73114
  }
 }
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-Settings-Orc-mc-SM/Ruin Warlock-rotation-FullBuffs-Consumes-ShortSingleTarget"
  value: {
-  dps: 1175.0857
+  dps: 1184.7839
   tps: 987.10045
  }
 }
@@ -204,7 +204,7 @@ dps_results: {
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1120.04081
+  dps: 1129.89471
   tps: 950.73114
  }
 }
diff --git a/sim/warrior/dps_warrior/TestP1DPSWarrior.results b/sim/warrior/dps_warrior/TestP1DPSWarrior.results
index e8647e945..065948dcb 100644
--- a/sim/warrior/dps_warrior/TestP1DPSWarrior.results
+++ b/sim/warrior/dps_warrior/TestP1DPSWarrior.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 21
   final_stats: 0
   final_stats: 0
-  final_stats: 1794.6
+  final_stats: 1894.6
   final_stats: 0
   final_stats: 37.9275
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 4843.1
-  final_stats: 620
+  final_stats: 520
   final_stats: 0
   final_stats: 5
   final_stats: 0
@@ -50,8 +50,8 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestP1DPSWarrior-Phase1-StatWeights-Default"
  value: {
-  weights: 0.323
-  weights: 0.27402
+  weights: 0.07973
+  weights: 0.10616
   weights: 0
   weights: 0
   weights: 0
@@ -67,9 +67,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.15833
+  weights: 0.01232
   weights: 0
-  weights: 2.82971
+  weights: 2.92367
   weights: 0
   weights: 0
   weights: 0
@@ -99,29 +99,29 @@ stat_weights_results: {
 dps_results: {
  key: "TestP1DPSWarrior-Phase1-Average-Default"
  value: {
-  dps: 252.82827
-  tps: 220.84168
+  dps: 263.31392
+  tps: 229.4469
  }
 }
 dps_results: {
  key: "TestP1DPSWarrior-Phase1-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 35.78963
-  tps: 121.04672
+  dps: 36.8638
+  tps: 121.90606
  }
 }
 dps_results: {
  key: "TestP1DPSWarrior-Phase1-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 32.75313
-  tps: 33.3951
+  dps: 33.82731
+  tps: 34.25444
  }
 }
 dps_results: {
  key: "TestP1DPSWarrior-Phase1-Settings-Human-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 88.33442
-  tps: 81.13763
+  dps: 91.28242
+  tps: 83.49603
  }
 }
 dps_results: {
@@ -148,22 +148,22 @@ dps_results: {
 dps_results: {
  key: "TestP1DPSWarrior-Phase1-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 37.94144
-  tps: 122.76817
+  dps: 39.0439
+  tps: 123.65014
  }
 }
 dps_results: {
  key: "TestP1DPSWarrior-Phase1-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 34.90494
-  tps: 35.11655
+  dps: 36.00741
+  tps: 35.99852
  }
 }
 dps_results: {
  key: "TestP1DPSWarrior-Phase1-Settings-Orc-p0.bis-DPS-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 91.88884
-  tps: 83.98116
+  dps: 94.83684
+  tps: 86.33956
  }
 }
 dps_results: {
@@ -190,7 +190,7 @@ dps_results: {
 dps_results: {
  key: "TestP1DPSWarrior-Phase1-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 199.15833
-  tps: 175.7919
+  dps: 206.52755
+  tps: 181.77799
  }
 }
diff --git a/sim/warrior/tank_warrior/TestP1TankWarrior.results b/sim/warrior/tank_warrior/TestP1TankWarrior.results
index dea1cdcb8..b24092ced 100644
--- a/sim/warrior/tank_warrior/TestP1TankWarrior.results
+++ b/sim/warrior/tank_warrior/TestP1TankWarrior.results
@@ -18,7 +18,7 @@ character_stats_results: {
   final_stats: 21
   final_stats: 0
   final_stats: 0
-  final_stats: 1794.6
+  final_stats: 1894.6
   final_stats: 0
   final_stats: 33.9275
   final_stats: 0
@@ -28,7 +28,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 4843.1
-  final_stats: 620
+  final_stats: 520
   final_stats: 10
   final_stats: 10.4
   final_stats: 0
@@ -50,7 +50,7 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestP1TankWarrior-Phase1-StatWeights-Default"
  value: {
-  weights: 0.15455
+  weights: -0.02903
   weights: 0
   weights: 0
   weights: 0
@@ -67,7 +67,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.14448
+  weights: 0.07747
   weights: 0
   weights: 0
   weights: 0
@@ -99,29 +99,29 @@ stat_weights_results: {
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Average-Default"
  value: {
-  dps: 195.62179
-  tps: 319.8424
+  dps: 203.87171
+  tps: 332.66015
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Settings-Human-p0.bis-Protection-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 25.9829
-  tps: 151.28618
+  dps: 26.71434
+  tps: 152.37969
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Settings-Human-p0.bis-Protection-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 22.8438
-  tps: 44.70752
+  dps: 23.57525
+  tps: 45.80103
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Settings-Human-p0.bis-Protection-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 32.88618
-  tps: 64.47453
+  dps: 33.93888
+  tps: 66.04832
  }
 }
 dps_results: {
@@ -148,22 +148,22 @@ dps_results: {
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Settings-Orc-p0.bis-Protection-p1-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 27.91557
-  tps: 149.17552
+  dps: 28.67968
+  tps: 150.31787
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Settings-Orc-p0.bis-Protection-p1-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 24.77647
-  tps: 47.34686
+  dps: 25.54059
+  tps: 48.48921
  }
 }
 dps_results: {
  key: "TestP1TankWarrior-Phase1-Settings-Orc-p0.bis-Protection-p1-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 35.76783
-  tps: 67.5326
+  dps: 36.85553
+  tps: 69.15871
  }
 }
 dps_results: {
@@ -190,7 +190,7 @@ dps_results: {
 dps_results: {
  key: "TestP1TankWarrior-Phase1-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 163.61273
-  tps: 269.75962
+  dps: 171.80381
+  tps: 282.51145
  }
 }
diff --git a/ui/core/components/inputs/buffs_debuffs.ts b/ui/core/components/inputs/buffs_debuffs.ts
index 965dd4759..f830f5017 100644
--- a/ui/core/components/inputs/buffs_debuffs.ts
+++ b/ui/core/components/inputs/buffs_debuffs.ts
@@ -252,10 +252,7 @@ export const MeleeCritBuff = withLabel(
 	'Leader of the Pack',
 );
 
-export const SpellCritBuff = withLabel(
-	makeBooleanRaidBuffInput({ actionId: () => ActionId.fromSpellId(24907), fieldName: 'moonkinAura' }),
-	'Moonkin Aura',
-);
+export const SpellCritBuff = withLabel(makeBooleanRaidBuffInput({ actionId: () => ActionId.fromSpellId(24907), fieldName: 'moonkinAura' }), 'Moonkin Aura');
 
 // Misc Buffs
 export const RetributionAura = makeTristateRaidBuffInput({
@@ -477,16 +474,6 @@ export const SpellWintersChillDebuff = withLabel(
 	'Frost Damage',
 );
 
-export const NatureSpellDamageDebuff = InputHelpers.makeMultiIconInput({
-	values: [
-		makeBooleanDebuffInput({
-			actionId: () => ActionId.fromSpellId(17364),
-			fieldName: 'stormstrike',
-		}),
-	],
-	label: 'Nature Damage',
-});
-
 export const SpellShadowWeavingDebuff = withLabel(
 	makeBooleanDebuffInput({
 		actionId: () => ActionId.fromSpellId(15334),
@@ -631,7 +618,7 @@ export const RAID_BUFFS_CONFIG = [
 	{
 		config: TrueshotAuraBuff,
 		picker: IconPicker,
-		stats: [Stat.StatRangedAttackPower],
+		stats: [Stat.StatRangedAttackPower, Stat.StatAttackPower],
 	},
 	{
 		config: MeleeCritBuff,
@@ -806,11 +793,6 @@ export const DEBUFFS_CONFIG = [
 		picker: IconPicker,
 		stats: [Stat.StatFrostPower],
 	},
-	{
-		config: NatureSpellDamageDebuff,
-		picker: MultiIconPicker,
-		stats: [Stat.StatNaturePower, Stat.StatArcanePower],
-	},
 	{
 		config: SpellShadowWeavingDebuff,
 		picker: IconPicker,
diff --git a/ui/core/components/inputs/consumables.ts b/ui/core/components/inputs/consumables.ts
index a4e910ffc..e820597d3 100644
--- a/ui/core/components/inputs/consumables.ts
+++ b/ui/core/components/inputs/consumables.ts
@@ -9,6 +9,7 @@ import {
 	Conjured,
 	Consumes,
 	Explosive,
+	Faction,
 	FirePowerBuff,
 	Flask,
 	Food,
@@ -75,8 +76,7 @@ function makeConsumeInputFactory<T extends number>(
 			),
 			equals: (a: T, b: T) => a == b,
 			zeroValue: 0 as T,
-			changedEvent: (player: Player<any>) =>
-				TypedEvent.onAny([player.consumesChangeEmitter, player.gearChangeEmitter, player.professionChangeEmitter]),
+			changedEvent: (player: Player<any>) => TypedEvent.onAny([player.consumesChangeEmitter, player.gearChangeEmitter, player.professionChangeEmitter]),
 			showWhen: (player: Player<any>) => !args.showWhen || args.showWhen(player),
 			getValue: (player: Player<any>) => player.getConsumes()[args.consumesFieldName] as T,
 			setValue: (eventID: EventID, player: Player<any>, newValue: number) => {
@@ -198,9 +198,7 @@ export const EXPLOSIVES_CONFIG: ConsumableStatOption<Explosive>[] = [
 	{ config: ExplosiveGoblinLandMine, stats: [] },
 ];
 
-export const SAPPER_CONFIG: ConsumableStatOption<SapperExplosive>[] = [
-	{ config: SapperGoblinSapper, stats: [] },
-];
+export const SAPPER_CONFIG: ConsumableStatOption<SapperExplosive>[] = [{ config: SapperGoblinSapper, stats: [] }];
 
 export const makeExplosivesInput = makeConsumeInputFactory({
 	consumesFieldName: 'fillerExplosive',
@@ -837,8 +835,9 @@ export const makeMp5ConsumeInput = makeConsumeInputFactory({ consumesFieldName:
 
 // Windfury (Buff)
 export const Windfury: ConsumableInputConfig<WeaponImbue> = {
-	actionId: () => ActionId.fromItemId(10614),
+	actionId: () => ActionId.fromSpellId(10614),
 	value: WeaponImbue.Windfury,
+	showWhen: player => player.getFaction() === Faction.Horde,
 };
 
 // Other Imbues
diff --git a/ui/rogue/sim.ts b/ui/rogue/sim.ts
index b8df85ae2..a526e1aea 100644
--- a/ui/rogue/sim.ts
+++ b/ui/rogue/sim.ts
@@ -123,7 +123,6 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRogue, {
 	includeBuffDebuffInputs: [
 		BuffDebuffInputs.SpellCritBuff,
 		BuffDebuffInputs.SpellShadowWeavingDebuff,
-		BuffDebuffInputs.NatureSpellDamageDebuff,
 		BuffDebuffInputs.SpellScorchDebuff,
 		BuffDebuffInputs.PowerInfusion,
 	],