From 909ff6422da9655b710582b72b02772d2a6024e7 Mon Sep 17 00:00:00 2001
From: Adam Chodaba <adamrch44@gmail.com>
Date: Sun, 22 Sep 2024 18:32:12 -0400
Subject: [PATCH] fix wf weapon phantom procs and enable stopattack on wf totem

---
 sim/core/buffs.go                             |   3 +-
 sim/core/consumes.go                          |   2 +-
 sim/druid/feral/TestFeral.results             | 410 ++++++------
 sim/hunter/TestBM.results                     |  40 +-
 sim/hunter/TestMM.results                     |  34 +-
 sim/hunter/TestSV.results                     |  70 +--
 sim/paladin/protection/TestProtection.results |  44 +-
 sim/paladin/retribution/TestExodin.results    |  88 +--
 .../retribution/TestRetribution.results       | 292 ++++-----
 sim/paladin/retribution/TestShockadin.results |  78 +--
 .../enhancement/TestEnhancement.results       | 590 +++++++++---------
 sim/shaman/warden/TestWardenShaman.results    |  92 +--
 sim/shaman/windfury_weapon.go                 |   2 +-
 13 files changed, 873 insertions(+), 872 deletions(-)

diff --git a/sim/core/buffs.go b/sim/core/buffs.go
index c39a9a7c46..f1d2db99a9 100644
--- a/sim/core/buffs.go
+++ b/sim/core/buffs.go
@@ -2292,7 +2292,8 @@ func ApplyWindfury(character *Character) *Aura {
 				} else {
 					windfuryBuffAura.SetStacks(sim, 2)
 				}
-				aura.Unit.AutoAttacks.ExtraMHAttack(sim, 1, ActionID{SpellID: 10610}, spell.ActionID)
+
+				aura.Unit.AutoAttacks.ExtraMHAttackProc(sim, 1, ActionID{SpellID: spellId}, spell)
 			}
 		},
 	}))
diff --git a/sim/core/consumes.go b/sim/core/consumes.go
index 2ad78d5145..1fa56f542e 100644
--- a/sim/core/consumes.go
+++ b/sim/core/consumes.go
@@ -393,7 +393,7 @@ func DragonBreathChiliAura(character *Character) *Aura {
 		ActionID:    ActionID{SpellID: 15851},
 		SpellSchool: SpellSchoolFire,
 		DefenseType: DefenseTypeMagic,
-		ProcMask:    ProcMaskSpellDamage,
+		ProcMask:    ProcMaskSpellDamageProc | ProcMaskSpellProc,
 		Flags:       SpellFlagNoOnCastComplete | SpellFlagPassiveSpell,
 
 		DamageMultiplier: 1,
diff --git a/sim/druid/feral/TestFeral.results b/sim/druid/feral/TestFeral.results
index 348c8a4b8e..7517df56e6 100644
--- a/sim/druid/feral/TestFeral.results
+++ b/sim/druid/feral/TestFeral.results
@@ -295,8 +295,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestFeral-Phase2-Lvl40-StatWeights-Default"
  value: {
-  weights: 0.94631
-  weights: 0.92558
+  weights: 0.94603
+  weights: 0.83019
   weights: 0
   weights: 0
   weights: 0
@@ -312,9 +312,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.41362
-  weights: 4.54326
-  weights: 5.55041
+  weights: 0.4135
+  weights: 3.97162
+  weights: 5.41439
   weights: 0
   weights: 0
   weights: 0
@@ -393,8 +393,8 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestFeral-Phase4-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.10496
-  weights: 2.54999
+  weights: 2.10484
+  weights: 2.54993
   weights: 0
   weights: 0
   weights: 0
@@ -410,7 +410,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.79733
+  weights: 0.79729
   weights: 0
   weights: 25.01944
   weights: 0
@@ -764,36 +764,36 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-AllItems-FeralheartRaiment"
  value: {
-  dps: 525.75104
-  tps: 384.1462
+  dps: 525.27048
+  tps: 383.60682
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Average-Default"
  value: {
-  dps: 804.88066
-  tps: 587.30898
+  dps: 803.97821
+  tps: 586.43536
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 496.89767
-  tps: 395.86248
+  dps: 495.06327
+  tps: 392.06085
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 461.5382
-  tps: 333.23803
+  dps: 460.40739
+  tps: 332.31019
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 573.95949
-  tps: 426.94773
+  tps: 426.89892
  }
 }
 dps_results: {
@@ -820,22 +820,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 496.89767
-  tps: 395.86248
+  dps: 495.06327
+  tps: 392.06085
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 461.5382
-  tps: 333.23803
+  dps: 460.40739
+  tps: 332.31019
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 573.95949
-  tps: 426.94773
+  tps: 426.89892
  }
 }
 dps_results: {
@@ -862,22 +862,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 496.89767
-  tps: 395.86248
+  dps: 495.06327
+  tps: 392.06085
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 461.5382
-  tps: 333.23803
+  dps: 460.40739
+  tps: 332.31019
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-NightElf-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 573.95949
-  tps: 426.94773
+  tps: 426.89892
  }
 }
 dps_results: {
@@ -904,22 +904,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 495.85137
-  tps: 393.75192
+  dps: 495.77207
+  tps: 391.731
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 461.53257
-  tps: 333.27102
+  dps: 460.41075
+  tps: 332.315
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-NoBleed-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 575.00397
-  tps: 427.79601
+  dps: 574.27838
+  tps: 427.30376
  }
 }
 dps_results: {
@@ -946,22 +946,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 495.85137
-  tps: 393.75192
+  dps: 495.77207
+  tps: 391.731
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 461.53257
-  tps: 333.27102
+  dps: 460.41075
+  tps: 332.315
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 575.00397
-  tps: 427.79601
+  dps: 574.27838
+  tps: 427.30376
  }
 }
 dps_results: {
@@ -988,22 +988,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 495.85137
-  tps: 393.75192
+  dps: 495.77207
+  tps: 391.731
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 461.53257
-  tps: 333.27102
+  dps: 460.41075
+  tps: 332.315
  }
 }
 dps_results: {
  key: "TestFeral-Phase2-Lvl40-Settings-Tauren-phase_2-Flower-Aoe-phase_2-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 575.00397
-  tps: 427.79601
+  dps: 574.27838
+  tps: 427.30376
  }
 }
 dps_results: {
@@ -1037,32 +1037,32 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-AllItems-FeralheartRaiment"
  value: {
-  dps: 904.57383
-  tps: 656.64863
-  hps: 9.1384
+  dps: 904.82231
+  tps: 656.5816
+  hps: 9.17246
  }
 }
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Average-Default"
  value: {
   dps: 1885.20208
-  tps: 1348.99855
+  tps: 1348.90915
   hps: 10.23716
  }
 }
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongMultiTarget"
  value: {
-  dps: 1347.3214
-  tps: 1070.41526
-  hps: 6.98702
+  dps: 1348.16294
+  tps: 1068.11345
+  hps: 6.98502
  }
 }
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongSingleTarget"
  value: {
-  dps: 1274.57219
-  tps: 910.68717
+  dps: 1275.30935
+  tps: 911.05043
   hps: 7.06116
  }
 }
@@ -1070,7 +1070,7 @@ dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget"
  value: {
   dps: 1436.01366
-  tps: 1022.93861
+  tps: 1022.92126
   hps: 7.2131
  }
 }
@@ -1101,16 +1101,16 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongMultiTarget"
  value: {
-  dps: 1347.3214
-  tps: 1070.41526
-  hps: 6.98702
+  dps: 1348.16294
+  tps: 1068.11345
+  hps: 6.98502
  }
 }
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongSingleTarget"
  value: {
-  dps: 1274.57219
-  tps: 910.68717
+  dps: 1275.30935
+  tps: 911.05043
   hps: 7.06116
  }
 }
@@ -1118,7 +1118,7 @@ dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Default-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget"
  value: {
   dps: 1436.01366
-  tps: 1022.93861
+  tps: 1022.92126
   hps: 7.2131
  }
 }
@@ -1149,16 +1149,16 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongMultiTarget"
  value: {
-  dps: 1347.3214
-  tps: 1070.41526
-  hps: 6.98702
+  dps: 1348.16294
+  tps: 1068.11345
+  hps: 6.98502
  }
 }
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongSingleTarget"
  value: {
-  dps: 1274.57219
-  tps: 910.68717
+  dps: 1275.30935
+  tps: 911.05043
   hps: 7.06116
  }
 }
@@ -1166,7 +1166,7 @@ dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-NightElf-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget"
  value: {
   dps: 1436.01366
-  tps: 1022.93861
+  tps: 1022.92126
   hps: 7.2131
  }
 }
@@ -1197,24 +1197,24 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongMultiTarget"
  value: {
-  dps: 1377.9229
-  tps: 1102.88321
-  hps: 7.00105
+  dps: 1378.13303
+  tps: 1101.98561
+  hps: 6.98702
  }
 }
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-LongSingleTarget"
  value: {
-  dps: 1305.14177
-  tps: 932.96653
-  hps: 7.07319
+  dps: 1305.35391
+  tps: 933.09281
+  hps: 7.06116
  }
 }
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-NoBleed-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget"
  value: {
   dps: 1471.681
-  tps: 1048.27619
+  tps: 1048.25471
   hps: 7.2131
  }
 }
@@ -1245,24 +1245,24 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongMultiTarget"
  value: {
-  dps: 1377.9229
-  tps: 1102.88321
-  hps: 7.00105
+  dps: 1378.13303
+  tps: 1101.98561
+  hps: 6.98702
  }
 }
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-LongSingleTarget"
  value: {
-  dps: 1305.14177
-  tps: 932.96653
-  hps: 7.07319
+  dps: 1305.35391
+  tps: 933.09281
+  hps: 7.06116
  }
 }
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Default-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget"
  value: {
   dps: 1471.681
-  tps: 1048.27619
+  tps: 1048.25471
   hps: 7.2131
  }
 }
@@ -1293,24 +1293,24 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongMultiTarget"
  value: {
-  dps: 1377.9229
-  tps: 1102.88321
-  hps: 7.00105
+  dps: 1378.13303
+  tps: 1101.98561
+  hps: 6.98702
  }
 }
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-LongSingleTarget"
  value: {
-  dps: 1305.14177
-  tps: 932.96653
-  hps: 7.07319
+  dps: 1305.35391
+  tps: 933.09281
+  hps: 7.06116
  }
 }
 dps_results: {
  key: "TestFeral-Phase3-Lvl50-Settings-Tauren-phase_3-Flower-Aoe-phase_3-FullBuffs-P3-Consumes-ShortSingleTarget"
  value: {
   dps: 1471.681
-  tps: 1048.27619
+  tps: 1048.25471
   hps: 7.2131
  }
 }
@@ -1342,127 +1342,127 @@ dps_results: {
  key: "TestFeral-Phase3-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
   dps: 1243.51501
-  tps: 886.67998
+  tps: 886.61256
   hps: 9.39953
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-BloodGuard'sCracklingLeather"
  value: {
-  dps: 1314.68003
-  tps: 960.77062
+  dps: 1315.64511
+  tps: 960.85808
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-BloodGuard'sLeather"
  value: {
-  dps: 1367.33986
-  tps: 998.04729
+  dps: 1363.07144
+  tps: 994.46331
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-BloodGuard'sRestoredLeather"
  value: {
-  dps: 1288.01552
-  tps: 941.87272
+  dps: 1285.05513
+  tps: 939.25444
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-CoagulateBloodguard'sLeathers"
  value: {
   dps: 2038.06723
-  tps: 1464.68614
+  tps: 1464.61022
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-EmeraldDreamkeeperGarb"
  value: {
-  dps: 1295.28723
-  tps: 946.83767
+  dps: 1291.45587
+  tps: 943.49176
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-EmeraldLeathers"
  value: {
-  dps: 1359.9638
-  tps: 992.79986
+  dps: 1355.7175
+  tps: 989.23257
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-EmeraldWatcherVestments"
  value: {
-  dps: 1301.14543
-  tps: 951.18364
+  dps: 1297.25727
+  tps: 947.67165
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-ExiledProphet'sRaiment"
  value: {
-  dps: 1900.62925
-  tps: 1375.71675
+  dps: 1900.92339
+  tps: 1375.55357
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-FeralheartRaiment"
  value: {
-  dps: 1391.253
-  tps: 1014.08366
+  dps: 1392.18876
+  tps: 1015.0521
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather"
  value: {
-  dps: 1314.68003
-  tps: 960.77062
+  dps: 1315.64511
+  tps: 960.85808
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLeather"
  value: {
-  dps: 1367.33986
-  tps: 998.04729
+  dps: 1363.07144
+  tps: 994.46331
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather"
  value: {
-  dps: 1288.01552
-  tps: 941.87272
+  dps: 1285.05513
+  tps: 939.25444
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-AllItems-LostWorshipper'sArmor"
  value: {
-  dps: 1960.51369
-  tps: 1419.19795
+  dps: 1955.59533
+  tps: 1415.37833
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3675.32168
-  tps: 2633.38863
+  dps: 3675.28392
+  tps: 2633.04063
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 14997.74456
-  tps: 10955.29074
+  dps: 14941.78194
+  tps: 10901.53691
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2451.52979
-  tps: 1756.40698
+  dps: 2444.69831
+  tps: 1751.40161
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 2720.52557
-  tps: 1943.97598
+  tps: 1943.81982
  }
 }
 dps_results: {
@@ -1489,22 +1489,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 14997.74456
-  tps: 10955.29074
+  dps: 14941.78194
+  tps: 10901.53691
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2451.52979
-  tps: 1756.40698
+  dps: 2444.69831
+  tps: 1751.40161
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Default-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 2720.52557
-  tps: 1943.97598
+  tps: 1943.81982
  }
 }
 dps_results: {
@@ -1531,22 +1531,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 14997.74456
-  tps: 10955.29074
+  dps: 14941.78194
+  tps: 10901.53691
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2451.52979
-  tps: 1756.40698
+  dps: 2444.69831
+  tps: 1751.40161
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-NightElf-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 2720.52557
-  tps: 1943.97598
+  tps: 1943.81982
  }
 }
 dps_results: {
@@ -1573,22 +1573,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 15649.12855
-  tps: 11416.91449
+  dps: 15573.64001
+  tps: 11349.95096
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2591.10074
-  tps: 1855.35708
+  dps: 2581.04158
+  tps: 1848.09428
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-NoBleed-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 2872.11002
-  tps: 2051.61645
+  tps: 2051.39611
  }
 }
 dps_results: {
@@ -1615,22 +1615,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 15649.12855
-  tps: 11416.91449
+  dps: 15573.64001
+  tps: 11349.95096
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2591.10074
-  tps: 1855.35708
+  dps: 2581.04158
+  tps: 1848.09428
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Default-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 2872.11002
-  tps: 2051.61645
+  tps: 2051.39611
  }
 }
 dps_results: {
@@ -1657,22 +1657,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 15649.12855
-  tps: 11416.91449
+  dps: 15573.64001
+  tps: 11349.95096
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2591.10074
-  tps: 1855.35708
+  dps: 2581.04158
+  tps: 1848.09428
  }
 }
 dps_results: {
  key: "TestFeral-Phase4-Lvl60-Settings-Tauren-phase_4-Flower-Aoe-phase_4-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 2872.11002
-  tps: 2051.61645
+  tps: 2051.39611
  }
 }
 dps_results: {
@@ -1700,126 +1700,126 @@ dps_results: {
  key: "TestFeral-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
   dps: 2735.24031
-  tps: 1953.65918
+  tps: 1953.65377
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-BloodGuard'sCracklingLeather"
  value: {
-  dps: 1376.46438
-  tps: 1003.68411
+  dps: 1379.92231
+  tps: 1005.73383
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-BloodGuard'sLeather"
  value: {
-  dps: 1434.78176
-  tps: 1045.34835
+  dps: 1435.97847
+  tps: 1045.9299
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-BloodGuard'sRestoredLeather"
  value: {
-  dps: 1350.4397
-  tps: 985.15113
+  dps: 1349.44556
+  tps: 984.04391
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-CoagulateBloodguard'sLeathers"
  value: {
   dps: 2313.02777
-  tps: 1659.91061
+  tps: 1659.71551
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-EmeraldDreamkeeperGarb"
  value: {
-  dps: 1356.9996
-  tps: 989.92106
+  dps: 1355.93621
+  tps: 988.90556
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-EmeraldLeathers"
  value: {
-  dps: 1427.42602
-  tps: 1040.11706
+  dps: 1428.61663
+  tps: 1040.69367
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-EmeraldWatcherVestments"
  value: {
-  dps: 1362.98324
-  tps: 994.10664
+  dps: 1362.63793
+  tps: 993.53914
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-ExiledProphet'sRaiment"
  value: {
-  dps: 2156.91766
-  tps: 1557.04918
+  dps: 2158.32555
+  tps: 1557.41457
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-FeralheartRaiment"
  value: {
-  dps: 1455.6253
-  tps: 1058.71941
+  dps: 1456.88246
+  tps: 1059.21193
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-Knight-Lieutenant'sCracklingLeather"
  value: {
-  dps: 1376.46438
-  tps: 1003.68411
+  dps: 1379.92231
+  tps: 1005.73383
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLeather"
  value: {
-  dps: 1434.78176
-  tps: 1045.34835
+  dps: 1435.97847
+  tps: 1045.9299
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-Knight-Lieutenant'sRestoredLeather"
  value: {
-  dps: 1350.4397
-  tps: 985.15113
+  dps: 1349.44556
+  tps: 984.04391
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-AllItems-LostWorshipper'sArmor"
  value: {
-  dps: 2200.84959
-  tps: 1588.71208
+  dps: 2201.49418
+  tps: 1588.89126
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4570.1227
-  tps: 3267.90735
+  dps: 4570.12222
+  tps: 3267.57527
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3382.19332
-  tps: 2680.4395
+  dps: 3374.49385
+  tps: 2666.92492
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3338.2212
-  tps: 2386.04247
+  dps: 3333.33301
+  tps: 2382.05968
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 3663.72275
-  tps: 2613.28858
+  tps: 2613.20131
  }
 }
 dps_results: {
@@ -1846,22 +1846,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3382.19332
-  tps: 2680.4395
+  dps: 3374.49385
+  tps: 2666.92492
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3338.2212
-  tps: 2386.04247
+  dps: 3333.33301
+  tps: 2382.05968
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 3663.72275
-  tps: 2613.28858
+  tps: 2613.20131
  }
 }
 dps_results: {
@@ -1888,22 +1888,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3382.19332
-  tps: 2680.4395
+  dps: 3374.49385
+  tps: 2666.92492
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3338.2212
-  tps: 2386.04247
+  dps: 3333.33301
+  tps: 2382.05968
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-NightElf-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 3663.72275
-  tps: 2613.28858
+  tps: 2613.20131
  }
 }
 dps_results: {
@@ -1930,22 +1930,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3340.34612
-  tps: 2653.43034
+  dps: 3335.37628
+  tps: 2646.92276
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3298.96658
-  tps: 2358.94052
+  dps: 3294.2373
+  tps: 2355.12701
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-NoBleed-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 3631.10014
-  tps: 2590.13383
+  tps: 2590.04656
  }
 }
 dps_results: {
@@ -1972,22 +1972,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3340.34612
-  tps: 2653.43034
+  dps: 3335.37628
+  tps: 2646.92276
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3298.96658
-  tps: 2358.94052
+  dps: 3294.2373
+  tps: 2355.12701
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Default-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 3631.10014
-  tps: 2590.13383
+  tps: 2590.04656
  }
 }
 dps_results: {
@@ -2014,22 +2014,22 @@ dps_results: {
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3340.34612
-  tps: 2653.43034
+  dps: 3335.37628
+  tps: 2646.92276
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3298.96658
-  tps: 2358.94052
+  dps: 3294.2373
+  tps: 2355.12701
  }
 }
 dps_results: {
  key: "TestFeral-Phase5-Lvl60-Settings-Tauren-phase_5-Flower-Aoe-phase_5-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 3631.10014
-  tps: 2590.13383
+  tps: 2590.04656
  }
 }
 dps_results: {
@@ -2057,6 +2057,6 @@ dps_results: {
  key: "TestFeral-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
   dps: 3310.28646
-  tps: 2360.81947
+  tps: 2360.69579
  }
 }
diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results
index 42b6399f8c..c1a6584b3d 100644
--- a/sim/hunter/TestBM.results
+++ b/sim/hunter/TestBM.results
@@ -100,70 +100,70 @@ dps_results: {
  key: "TestBM-Phase2-Lvl40-AllItems-BeastmasterArmor"
  value: {
   dps: 489.49252
-  tps: 223.83266
+  tps: 223.69363
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-AllItems-Maelstrom'sWrath-231320"
  value: {
   dps: 865.88251
-  tps: 370.4183
+  tps: 370.3313
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-AllItems-SignetofBeasts-209823"
  value: {
   dps: 839.2032
-  tps: 361.28879
+  tps: 361.19904
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-AllItems-ZandalarPredator'sBelt-231322"
  value: {
   dps: 714.22403
-  tps: 379.58879
+  tps: 379.51544
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-AllItems-ZandalarPredator'sBracers-231323"
  value: {
   dps: 848.48056
-  tps: 366.02447
+  tps: 365.93747
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-AllItems-ZandalarPredator'sMantle-231321"
  value: {
   dps: 856.25926
-  tps: 365.64571
+  tps: 365.55871
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Average-Default"
  value: {
   dps: 847.46068
-  tps: 363.97829
+  tps: 363.8965
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
   dps: 2221.16645
-  tps: 2028.94963
+  tps: 2025.38702
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
   dps: 860.19493
-  tps: 378.0293
+  tps: 377.91924
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 909.86818
-  tps: 390.11505
+  tps: 389.84961
  }
 }
 dps_results: {
@@ -233,21 +233,21 @@ dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
   dps: 589.59629
-  tps: 664.60716
+  tps: 660.03094
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
   dps: 484.46955
-  tps: 229.52542
+  tps: 229.2988
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-NightElf-p2_ranged_bm-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 517.04451
-  tps: 244.66849
+  tps: 244.63477
  }
 }
 dps_results: {
@@ -317,21 +317,21 @@ dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
   dps: 2154.06272
-  tps: 1961.85019
+  tps: 1957.6332
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
   dps: 852.34148
-  tps: 366.24219
+  tps: 366.19273
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 888.1477
-  tps: 368.7463
+  tps: 368.49394
  }
 }
 dps_results: {
@@ -401,21 +401,21 @@ dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
   dps: 593.22773
-  tps: 657.62938
+  tps: 654.95086
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
   dps: 488.62947
-  tps: 223.14492
+  tps: 223.0159
  }
 }
 dps_results: {
  key: "TestBM-Phase2-Lvl40-Settings-Orc-p2_ranged_bm-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 521.02403
-  tps: 235.7335
+  tps: 235.4337
  }
 }
 dps_results: {
@@ -485,6 +485,6 @@ dps_results: {
  key: "TestBM-Phase2-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
   dps: 810.05409
-  tps: 337.69186
+  tps: 337.60687
  }
 }
diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results
index 631c3d4d8d..278d148f12 100644
--- a/sim/hunter/TestMM.results
+++ b/sim/hunter/TestMM.results
@@ -198,7 +198,7 @@ dps_results: {
  key: "TestMM-Phase2-Lvl40-AllItems-BeastmasterArmor"
  value: {
   dps: 333.57237
-  tps: 170.12917
+  tps: 170.12798
  }
 }
 dps_results: {
@@ -240,7 +240,7 @@ dps_results: {
  key: "TestMM-Phase2-Lvl40-Average-Default"
  value: {
   dps: 345.94156
-  tps: 184.63408
+  tps: 184.63261
  }
 }
 dps_results: {
@@ -338,7 +338,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-BeastmasterArmor"
  value: {
   dps: 512.21178
-  tps: 512.31758
+  tps: 512.32249
   hps: 10.12473
  }
 }
@@ -346,7 +346,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-BloodGuard'sChain"
  value: {
   dps: 728.12015
-  tps: 728.22568
+  tps: 728.2306
   hps: 10.03567
  }
 }
@@ -354,7 +354,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-BloodlashBow-216516"
  value: {
   dps: 861.05857
-  tps: 861.1641
+  tps: 861.16902
   hps: 12.98882
  }
 }
@@ -362,7 +362,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-DevilsaurEye-19991"
  value: {
   dps: 860.07955
-  tps: 860.18508
+  tps: 860.19
   hps: 12.98882
  }
 }
@@ -370,7 +370,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-DevilsaurTooth-19992"
  value: {
   dps: 853.14314
-  tps: 853.24867
+  tps: 853.25359
   hps: 12.98882
  }
 }
@@ -378,7 +378,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-DreadHunter'sChain"
  value: {
   dps: 634.05791
-  tps: 634.1729
+  tps: 634.17781
   hps: 9.5885
  }
 }
@@ -386,7 +386,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-GurubashiPitFighter'sBow-221450"
  value: {
   dps: 862.54251
-  tps: 862.64804
+  tps: 862.65296
   hps: 12.98882
  }
 }
@@ -394,7 +394,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-Knight-Lieutenant'sChain"
  value: {
   dps: 728.12015
-  tps: 728.22568
+  tps: 728.2306
   hps: 10.03567
  }
 }
@@ -402,7 +402,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-Maelstrom'sWrath-231320"
  value: {
   dps: 861.55776
-  tps: 861.6633
+  tps: 861.66821
   hps: 12.81888
  }
 }
@@ -410,7 +410,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-SignetofBeasts-209823"
  value: {
   dps: 848.97089
-  tps: 849.07643
+  tps: 849.08134
   hps: 12.98882
  }
 }
@@ -418,7 +418,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-ZandalarPredator'sBelt-231322"
  value: {
   dps: 809.71002
-  tps: 809.81556
+  tps: 809.82047
   hps: 12.98882
  }
 }
@@ -426,7 +426,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-ZandalarPredator'sBracers-231323"
  value: {
   dps: 733.77728
-  tps: 733.88281
+  tps: 733.88773
   hps: 12.98882
  }
 }
@@ -434,7 +434,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-AllItems-ZandalarPredator'sMantle-231321"
  value: {
   dps: 846.09139
-  tps: 846.19693
+  tps: 846.20184
   hps: 12.98882
  }
 }
@@ -442,7 +442,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-Average-Default"
  value: {
   dps: 865.04746
-  tps: 865.15329
+  tps: 865.15344
   hps: 13.04623
  }
 }
@@ -546,7 +546,7 @@ dps_results: {
  key: "TestMM-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
   dps: 718.54495
-  tps: 718.65022
+  tps: 718.65514
   hps: 11.10274
  }
 }
diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results
index bbf6d677cd..fc832b54b7 100644
--- a/sim/hunter/TestSV.results
+++ b/sim/hunter/TestSV.results
@@ -198,70 +198,70 @@ dps_results: {
  key: "TestSV-Phase2-Lvl40-AllItems-BeastmasterArmor"
  value: {
   dps: 404.36276
-  tps: 254.31617
+  tps: 254.25908
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-AllItems-Maelstrom'sWrath-231320"
  value: {
   dps: 805.67627
-  tps: 399.5799
+  tps: 399.38329
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-AllItems-SignetofBeasts-209823"
  value: {
   dps: 783.27974
-  tps: 388.70839
+  tps: 388.51178
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-AllItems-ZandalarPredator'sBelt-231322"
  value: {
   dps: 615.35199
-  tps: 410.03218
+  tps: 409.98031
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-AllItems-ZandalarPredator'sBracers-231323"
  value: {
   dps: 793.25944
-  tps: 394.3363
+  tps: 394.13969
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-AllItems-ZandalarPredator'sMantle-231321"
  value: {
   dps: 799.50497
-  tps: 394.80202
+  tps: 394.60541
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Average-Default"
  value: {
   dps: 797.42795
-  tps: 398.8066
+  tps: 398.71069
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
   dps: 2284.50471
-  tps: 2169.76588
+  tps: 2166.03512
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
   dps: 808.31588
-  tps: 410.31976
+  tps: 410.21559
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Dwarf-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 849.78271
-  tps: 430.14413
+  tps: 429.91532
  }
 }
 dps_results: {
@@ -289,21 +289,21 @@ dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
   dps: 2236.45419
-  tps: 2122.58783
+  tps: 2119.8579
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
   dps: 798.76089
-  tps: 399.06699
+  tps: 398.87802
  }
 }
 dps_results: {
  key: "TestSV-Phase2-Lvl40-Settings-Orc-p2_melee-Basic-p2_melee-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 836.23675
-  tps: 414.95814
+  tps: 414.72096
  }
 }
 dps_results: {
@@ -331,14 +331,14 @@ dps_results: {
  key: "TestSV-Phase2-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
   dps: 753.35462
-  tps: 373.92219
+  tps: 373.81342
  }
 }
 dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-BeastmasterArmor"
  value: {
   dps: 1125.0274
-  tps: 905.30461
+  tps: 905.28074
   hps: 14.3972
  }
 }
@@ -346,7 +346,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-BloodGuard'sChain"
  value: {
   dps: 1394.86526
-  tps: 1150.69522
+  tps: 1150.65857
   hps: 14.3972
  }
 }
@@ -354,7 +354,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-BloodlashBow-216516"
  value: {
   dps: 1374.85078
-  tps: 1377.33374
+  tps: 1377.32773
   hps: 11.3294
  }
 }
@@ -362,7 +362,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-DevilsaurEye-19991"
  value: {
   dps: 3673.02769
-  tps: 3293.14648
+  tps: 3293.00346
   hps: 19.9832
  }
 }
@@ -370,7 +370,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-DevilsaurTooth-19992"
  value: {
   dps: 3641.81961
-  tps: 3265.08614
+  tps: 3264.94311
   hps: 19.9832
  }
 }
@@ -378,7 +378,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-DreadHunter'sChain"
  value: {
   dps: 2089.2021
-  tps: 1823.74808
+  tps: 1823.61287
   hps: 14.99414
  }
 }
@@ -386,7 +386,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-GurubashiPitFighter'sBow-221450"
  value: {
   dps: 1403.44798
-  tps: 1405.93095
+  tps: 1405.92493
   hps: 11.3294
  }
 }
@@ -394,7 +394,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-Knight-Lieutenant'sChain"
  value: {
   dps: 1394.86526
-  tps: 1150.69522
+  tps: 1150.65857
   hps: 14.3972
  }
 }
@@ -402,7 +402,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-Maelstrom'sWrath-231320"
  value: {
   dps: 3690.42429
-  tps: 3313.99137
+  tps: 3313.86928
   hps: 19.82352
  }
 }
@@ -410,7 +410,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-SignetofBeasts-209823"
  value: {
   dps: 3603.43858
-  tps: 3234.71527
+  tps: 3234.57717
   hps: 20.40391
  }
 }
@@ -418,7 +418,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-ZandalarPredator'sBelt-231322"
  value: {
   dps: 3287.89016
-  tps: 2953.73746
+  tps: 2953.59443
   hps: 19.40117
  }
 }
@@ -426,7 +426,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-ZandalarPredator'sBracers-231323"
  value: {
   dps: 3284.22927
-  tps: 2922.29375
+  tps: 2922.15072
   hps: 19.40117
  }
 }
@@ -434,7 +434,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-AllItems-ZandalarPredator'sMantle-231321"
  value: {
   dps: 3558.43485
-  tps: 3196.93685
+  tps: 3196.79382
   hps: 19.40117
  }
 }
@@ -442,7 +442,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-Average-Default"
  value: {
   dps: 3674.77082
-  tps: 3298.18049
+  tps: 3298.0571
   hps: 20.24192
  }
 }
@@ -450,7 +450,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
   dps: 8352.41866
-  tps: 8417.05457
+  tps: 8414.18371
   hps: 20.54717
  }
 }
@@ -458,7 +458,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
   dps: 3696.81626
-  tps: 3338.52364
+  tps: 3338.36794
   hps: 20.08257
  }
 }
@@ -466,7 +466,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Dwarf-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 3590.04652
-  tps: 3256.13567
+  tps: 3255.86777
   hps: 18.37475
  }
 }
@@ -498,7 +498,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
   dps: 8811.11951
-  tps: 8876.5542
+  tps: 8873.22406
   hps: 20.78363
  }
 }
@@ -506,7 +506,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
   dps: 3949.63969
-  tps: 3578.92213
+  tps: 3578.77175
   hps: 20.51249
  }
 }
@@ -514,7 +514,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-Settings-Orc-p4_weave-Weave-p4_weave-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 3857.71902
-  tps: 3475.32797
+  tps: 3475.03491
   hps: 19.83341
  }
 }
@@ -546,7 +546,7 @@ dps_results: {
  key: "TestSV-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
   dps: 3415.11165
-  tps: 3104.46791
+  tps: 3104.32148
   hps: 19.83795
  }
 }
diff --git a/sim/paladin/protection/TestProtection.results b/sim/paladin/protection/TestProtection.results
index 90beba9b9e..731b1d453e 100644
--- a/sim/paladin/protection/TestProtection.results
+++ b/sim/paladin/protection/TestProtection.results
@@ -100,98 +100,98 @@ dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
   dps: 1257.21714
-  tps: 2278.01818
+  tps: 2277.96564
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-Hero'sBrand-231328"
  value: {
   dps: 1567.23292
-  tps: 3172.4815
+  tps: 3172.40819
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
   dps: 1257.29732
-  tps: 2278.71448
+  tps: 2278.66952
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
   dps: 1329.37556
-  tps: 2404.49272
+  tps: 2404.45206
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-LibramofDraconicDestruction-221457"
  value: {
   dps: 1618.62735
-  tps: 3270.6126
+  tps: 3270.50845
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
   dps: 1432.94783
-  tps: 2894.30339
+  tps: 2894.25207
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-SanctifiedOrb-20512"
  value: {
   dps: 1628.89046
-  tps: 3282.48634
+  tps: 3282.39677
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-SoulforgeArmor"
  value: {
   dps: 1017.76917
-  tps: 1521.26596
+  tps: 1521.25783
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
   dps: 1341.35831
-  tps: 2718.54943
+  tps: 2718.47522
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
   dps: 1586.68077
-  tps: 3210.34649
+  tps: 3210.24994
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Average-Default"
  value: {
   dps: 1606.27371
-  tps: 3242.21619
+  tps: 3242.19692
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1030.95013
-  tps: 3280.13135
+  dps: 1024.84225
+  tps: 3249.09921
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 364.20435
-  tps: 1181.39487
+  dps: 363.29876
+  tps: 1175.42963
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Settings-Dwarf-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 487.5692
-  tps: 1549.98051
+  tps: 1549.73468
  }
 }
 dps_results: {
@@ -218,22 +218,22 @@ dps_results: {
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1036.74988
-  tps: 3297.24871
+  dps: 1027.13583
+  tps: 3263.79037
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 369.28215
-  tps: 1196.27107
+  dps: 368.25674
+  tps: 1187.67262
  }
 }
 dps_results: {
  key: "TestProtection-Phase4-Lvl60-Settings-Human-p4prot-P4 Prot-p4prot-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 489.86342
-  tps: 1557.85762
+  tps: 1557.61178
  }
 }
 dps_results: {
@@ -261,6 +261,6 @@ dps_results: {
  key: "TestProtection-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
   dps: 1348.74311
-  tps: 2777.91826
+  tps: 2777.93485
  }
 }
diff --git a/sim/paladin/retribution/TestExodin.results b/sim/paladin/retribution/TestExodin.results
index ecc7b93c1e..be4d7991d5 100644
--- a/sim/paladin/retribution/TestExodin.results
+++ b/sim/paladin/retribution/TestExodin.results
@@ -198,98 +198,98 @@ dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
   dps: 1336.87262
-  tps: 1372.14193
+  tps: 1372.06571
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-Hero'sBrand-231328"
  value: {
   dps: 3224.58066
-  tps: 3256.9474
+  tps: 3256.91886
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
   dps: 1337.01263
-  tps: 1373.14723
+  tps: 1373.08855
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
   dps: 1436.83232
-  tps: 1474.24761
+  tps: 1474.21743
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-LibramofDraconicDestruction-221457"
  value: {
   dps: 3262.10077
-  tps: 3294.38807
+  tps: 3294.31845
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
   dps: 1572.71774
-  tps: 1610.38975
+  tps: 1610.38093
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-SanctifiedOrb-20512"
  value: {
   dps: 3139.97411
-  tps: 3172.37153
+  tps: 3172.3625
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-SoulforgeArmor"
  value: {
   dps: 1215.57282
-  tps: 1252.14214
+  tps: 1252.07982
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
   dps: 1416.72379
-  tps: 1454.58883
+  tps: 1454.47473
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
   dps: 1665.71711
-  tps: 1703.5719
+  tps: 1703.4567
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Average-Default"
  value: {
   dps: 3249.30607
-  tps: 3281.33243
+  tps: 3281.32038
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1475.47101
-  tps: 2025.21117
+  dps: 1480.97125
+  tps: 2028.59703
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 624.96536
-  tps: 652.38304
+  dps: 626.38901
+  tps: 653.68525
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Dwarf-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 707.29814
-  tps: 738.36393
+  tps: 738.24101
  }
 }
 dps_results: {
@@ -316,22 +316,22 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Human-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1495.90777
-  tps: 2049.38126
+  dps: 1488.4063
+  tps: 2038.87613
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Human-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 636.11252
-  tps: 663.80541
+  dps: 639.15333
+  tps: 666.65001
  }
 }
 dps_results: {
  key: "TestExodin-Phase4-Lvl60-Settings-Human-p4ret-exodin-6pcT1-P4 Seal of Martyrdom Ret-p4ret-exodin-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 710.21146
-  tps: 741.31884
+  tps: 741.19592
  }
 }
 dps_results: {
@@ -359,105 +359,105 @@ dps_results: {
  key: "TestExodin-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
   dps: 2685.2624
-  tps: 2719.99858
+  tps: 2719.96003
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
   dps: 1637.13445
-  tps: 1672.90396
+  tps: 1672.77418
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-Hero'sBrand-231328"
  value: {
   dps: 4454.49855
-  tps: 4493.79517
+  tps: 4493.78987
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
   dps: 1637.14331
-  tps: 1673.70022
+  tps: 1673.59764
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
   dps: 1757.15569
-  tps: 1794.91658
+  tps: 1794.84193
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-LibramofDraconicDestruction-221457"
  value: {
   dps: 4523.15933
-  tps: 4562.12079
+  tps: 4562.10913
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
   dps: 1925.99329
-  tps: 1963.91016
+  tps: 1963.84421
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-SanctifiedOrb-20512"
  value: {
   dps: 4414.00967
-  tps: 4453.18862
+  tps: 4453.14549
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-SoulforgeArmor"
  value: {
   dps: 1486.46953
-  tps: 1523.46257
+  tps: 1523.40668
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
   dps: 1773.11978
-  tps: 1811.17724
+  tps: 1811.19954
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
   dps: 2043.75592
-  tps: 2081.80495
+  tps: 2081.82898
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Average-Default"
  value: {
   dps: 4536.61207
-  tps: 4575.04626
+  tps: 4575.0366
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2519.29175
-  tps: 3166.36375
+  dps: 2516.92893
+  tps: 3160.23147
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1043.20706
-  tps: 1075.58678
+  dps: 1040.68892
+  tps: 1072.92922
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Dwarf-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 1136.28585
-  tps: 1175.34822
+  tps: 1175.17614
  }
 }
 dps_results: {
@@ -484,22 +484,22 @@ dps_results: {
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2544.94794
-  tps: 3194.05159
+  dps: 2538.13849
+  tps: 3182.87465
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1057.02384
-  tps: 1089.75461
+  dps: 1054.40896
+  tps: 1086.87081
  }
 }
 dps_results: {
  key: "TestExodin-Phase5-Lvl60-Settings-Human-p5exodin-P5 Seal of Martyrdom Ret-p5ret-exodin-6CF2DR-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 1140.56323
-  tps: 1179.82654
+  tps: 1179.65445
  }
 }
 dps_results: {
@@ -527,6 +527,6 @@ dps_results: {
  key: "TestExodin-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
   dps: 3753.52709
-  tps: 3795.84347
+  tps: 3795.82454
  }
 }
diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results
index 878c951da3..0b4ec798d2 100644
--- a/sim/paladin/retribution/TestRetribution.results
+++ b/sim/paladin/retribution/TestRetribution.results
@@ -344,12 +344,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestRetribution-Phase3-Lvl50-StatWeights-Default"
  value: {
-  weights: 1.0589
-  weights: 1.06334
+  weights: 1.06725
+  weights: 1.01742
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.28148
+  weights: 0.28111
   weights: 0
   weights: 0
   weights: 0
@@ -357,13 +357,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 2.46985
+  weights: 2.53149
   weights: 0.46126
   weights: 0
   weights: 0
-  weights: 0.40176
-  weights: 12.83994
-  weights: 9.76991
+  weights: 0.40626
+  weights: 12.73206
+  weights: 9.79176
   weights: 0
   weights: 0
   weights: 0
@@ -398,7 +398,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.41054
+  weights: 0.4105
   weights: 0
   weights: 0
   weights: 0
@@ -406,7 +406,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 5.44049
+  weights: 5.43603
   weights: 0.78849
   weights: 0
   weights: 0
@@ -442,12 +442,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestRetribution-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 3.1969
-  weights: 1.60275
+  weights: 3.16255
+  weights: 1.63265
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.50862
+  weights: 0.5085
   weights: 0
   weights: 0
   weights: 0
@@ -455,13 +455,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 11.51538
+  weights: 11.02887
   weights: 0.66369
   weights: 0
   weights: 0
-  weights: 1.07306
-  weights: 1.39309
-  weights: 35.92409
+  weights: 1.07405
+  weights: 1.44319
+  weights: 35.43944
   weights: 0
   weights: 0
   weights: 0
@@ -618,56 +618,56 @@ dps_results: {
  key: "TestRetribution-Phase2-Lvl40-AllItems-Hero'sBrand-231328"
  value: {
   dps: 546.46321
-  tps: 560.24759
+  tps: 560.19666
  }
 }
 dps_results: {
  key: "TestRetribution-Phase2-Lvl40-AllItems-SoulforgeArmor"
  value: {
   dps: 327.52646
-  tps: 335.48196
+  tps: 335.36102
  }
 }
 dps_results: {
  key: "TestRetribution-Phase2-Lvl40-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
   dps: 470.96511
-  tps: 484.95461
+  tps: 484.88019
  }
 }
 dps_results: {
  key: "TestRetribution-Phase2-Lvl40-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
   dps: 486.02225
-  tps: 496.45917
+  tps: 496.44432
  }
 }
 dps_results: {
  key: "TestRetribution-Phase2-Lvl40-Average-Default"
  value: {
   dps: 548.4983
-  tps: 562.06439
+  tps: 562.00552
  }
 }
 dps_results: {
  key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
   dps: 429.91227
-  tps: 674.97748
+  tps: 674.9001
  }
 }
 dps_results: {
  key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
   dps: 205.35988
-  tps: 217.19747
+  tps: 217.22901
  }
 }
 dps_results: {
  key: "TestRetribution-Phase2-Lvl40-Settings-Dwarf-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 227.60289
-  tps: 239.41377
+  tps: 239.32088
  }
 }
 dps_results: {
@@ -695,21 +695,21 @@ dps_results: {
  key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
   dps: 429.52991
-  tps: 673.47861
+  tps: 674.45611
  }
 }
 dps_results: {
  key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
   dps: 205.29952
-  tps: 217.13258
+  tps: 217.11827
  }
 }
 dps_results: {
  key: "TestRetribution-Phase2-Lvl40-Settings-Human-p2retsoc-P2 Seal of Command Ret-p2ret-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 228.38983
-  tps: 240.18327
+  tps: 240.10812
  }
 }
 dps_results: {
@@ -737,63 +737,63 @@ dps_results: {
  key: "TestRetribution-Phase2-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
   dps: 516.61655
-  tps: 530.03508
+  tps: 529.97864
  }
 }
 dps_results: {
  key: "TestRetribution-Phase3-Lvl50-AllItems-Hero'sBrand-231328"
  value: {
-  dps: 1126.51965
-  tps: 1165.00914
+  dps: 1126.13527
+  tps: 1164.54067
  }
 }
 dps_results: {
  key: "TestRetribution-Phase3-Lvl50-AllItems-SoulforgeArmor"
  value: {
   dps: 733.69783
-  tps: 768.39156
+  tps: 768.12046
  }
 }
 dps_results: {
  key: "TestRetribution-Phase3-Lvl50-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
-  dps: 978.62013
-  tps: 1017.17455
+  dps: 977.90371
+  tps: 1016.35238
  }
 }
 dps_results: {
  key: "TestRetribution-Phase3-Lvl50-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
-  dps: 1114.6238
-  tps: 1153.10989
+  dps: 1115.05641
+  tps: 1153.4549
  }
 }
 dps_results: {
  key: "TestRetribution-Phase3-Lvl50-Average-Default"
  value: {
-  dps: 1137.00091
-  tps: 1175.47879
+  dps: 1136.71557
+  tps: 1175.09789
  }
 }
 dps_results: {
  key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-LongMultiTarget"
  value: {
-  dps: 1446.07589
-  tps: 1990.26819
+  dps: 1443.20567
+  tps: 1984.88419
  }
 }
 dps_results: {
  key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-LongSingleTarget"
  value: {
-  dps: 339.62505
-  tps: 366.87094
+  dps: 338.88685
+  tps: 366.00403
  }
 }
 dps_results: {
  key: "TestRetribution-Phase3-Lvl50-Settings-Dwarf-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-ShortSingleTarget"
  value: {
   dps: 400.41198
-  tps: 428.15733
+  tps: 428.02316
  }
 }
 dps_results: {
@@ -820,22 +820,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-LongMultiTarget"
  value: {
-  dps: 1455.93366
-  tps: 2002.59553
+  dps: 1451.4421
+  tps: 1996.41021
  }
 }
 dps_results: {
  key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-LongSingleTarget"
  value: {
-  dps: 342.12704
-  tps: 369.50429
+  dps: 342.37064
+  tps: 369.59921
  }
 }
 dps_results: {
  key: "TestRetribution-Phase3-Lvl50-Settings-Human-p3retsom-P3 Seal of Martyrdom Ret-p3ret-FullBuffs-P3-Consumes-ShortSingleTarget"
  value: {
   dps: 402.94345
-  tps: 429.79641
+  tps: 430.57606
  }
 }
 dps_results: {
@@ -862,106 +862,106 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase3-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1077.2147
-  tps: 1115.23989
+  dps: 1076.46553
+  tps: 1114.32392
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 1675.67907
-  tps: 1714.78084
+  dps: 1693.88219
+  tps: 1732.90805
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-Hero'sBrand-231328"
  value: {
   dps: 3630.43326
-  tps: 3680.52342
+  tps: 3680.4585
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 1691.32773
-  tps: 1731.06445
+  dps: 1692.16845
+  tps: 1731.28515
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 1785.03209
-  tps: 1824.69854
+  dps: 1777.88341
+  tps: 1817.3134
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-LibramofDraconicDestruction-221457"
  value: {
   dps: 3678.11475
-  tps: 3728.03725
+  tps: 3727.97566
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 2231.28264
-  tps: 2282.57375
+  dps: 2233.66011
+  tps: 2284.76953
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-SanctifiedOrb-20512"
  value: {
   dps: 3594.76388
-  tps: 3644.22233
+  tps: 3644.12059
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1575.59886
-  tps: 1615.10673
+  dps: 1575.48636
+  tps: 1614.65441
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
   dps: 3205.63618
-  tps: 3255.75163
+  tps: 3255.7235
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
-  dps: 2364.91387
-  tps: 2408.44294
+  dps: 2363.79083
+  tps: 2407.22025
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3689.60874
-  tps: 3739.18722
+  dps: 3689.60495
+  tps: 3739.13793
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 164.26854
-  tps: 365.37036
+  dps: 167.179
+  tps: 367.78916
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 138.93327
-  tps: 148.98836
+  dps: 140.49191
+  tps: 150.52242
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 410.1563
-  tps: 428.21631
+  tps: 428.14256
  }
 }
 dps_results: {
@@ -988,22 +988,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2220.98226
-  tps: 2805.46213
+  dps: 2198.3589
+  tps: 2776.60366
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1003.40287
-  tps: 1032.56947
+  dps: 995.13927
+  tps: 1024.23651
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 1128.99401
-  tps: 1162.4665
+  tps: 1162.29441
  }
 }
 dps_results: {
@@ -1030,22 +1030,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 181.38359
-  tps: 391.72875
+  dps: 181.32896
+  tps: 390.59245
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 160.16566
-  tps: 170.68784
+  dps: 158.91066
+  tps: 169.38367
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 475.16119
-  tps: 494.62244
+  dps: 472.75303
+  tps: 492.01762
  }
 }
 dps_results: {
@@ -1072,15 +1072,15 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 339.46032
-  tps: 770.92553
+  dps: 334.40108
+  tps: 763.89963
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Dwarf-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 296.30384
-  tps: 317.89893
+  dps: 290.97268
+  tps: 312.44761
  }
 }
 dps_results: {
@@ -1113,22 +1113,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 169.38642
-  tps: 371.27491
+  dps: 168.3846
+  tps: 369.28976
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 141.34008
-  tps: 151.42959
+  dps: 141.88243
+  tps: 151.93261
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 409.68326
-  tps: 427.74327
+  tps: 427.66952
  }
 }
 dps_results: {
@@ -1155,22 +1155,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2207.82482
-  tps: 2793.45296
+  dps: 2217.93292
+  tps: 2799.73786
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1000.60832
-  tps: 1029.83996
+  dps: 996.12406
+  tps: 1025.1267
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4ret-twisting-6pcT1-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 1128.17704
-  tps: 1161.72155
+  tps: 1161.54947
  }
 }
 dps_results: {
@@ -1197,22 +1197,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 187.93122
-  tps: 398.66972
+  dps: 187.50262
+  tps: 397.25778
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 163.91731
-  tps: 174.45915
+  dps: 162.6968
+  tps: 173.19931
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 475.32321
-  tps: 494.78447
+  dps: 473.64095
+  tps: 492.93013
  }
 }
 dps_results: {
@@ -1239,15 +1239,15 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 349.86809
-  tps: 784.15125
+  dps: 346.57546
+  tps: 778.35543
  }
 }
 dps_results: {
  key: "TestRetribution-Phase4-Lvl60-Settings-Human-p4rettwist-P4 Seal of Martyrdom Ret-p4ret-twisting-6pcT1-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 303.3566
-  tps: 325.0636
+  dps: 298.00447
+  tps: 319.61313
  }
 }
 dps_results: {
@@ -1281,105 +1281,105 @@ dps_results: {
  key: "TestRetribution-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
   dps: 3014.52459
-  tps: 3063.56549
+  tps: 3063.51159
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 2413.44324
-  tps: 2471.27111
+  dps: 2405.84541
+  tps: 2463.33093
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-Hero'sBrand-231328"
  value: {
-  dps: 4417.82728
-  tps: 4473.99627
+  dps: 4418.19144
+  tps: 4474.34254
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 2413.20741
-  tps: 2471.59854
+  dps: 2405.17591
+  tps: 2463.20201
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 2567.31119
-  tps: 2627.28333
+  dps: 2565.4524
+  tps: 2625.05517
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-LibramofDraconicDestruction-221457"
  value: {
-  dps: 4506.91113
-  tps: 4563.12079
+  dps: 4502.92572
+  tps: 4558.98057
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 3868.04015
-  tps: 3930.94298
+  dps: 3870.9226
+  tps: 3933.71534
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-SanctifiedOrb-20512"
  value: {
-  dps: 4371.80617
-  tps: 4427.44583
+  dps: 4376.75928
+  tps: 4432.4377
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1859.1243
-  tps: 1910.48579
+  dps: 1859.27724
+  tps: 1910.64311
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
-  dps: 3735.11603
-  tps: 3791.2214
+  dps: 3740.10518
+  tps: 3796.20573
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
-  dps: 4100.7723
-  tps: 4159.28481
+  dps: 4101.31154
+  tps: 4159.7642
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4480.30763
-  tps: 4536.66096
+  dps: 4479.7464
+  tps: 4536.03312
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 841.05337
-  tps: 1095.35353
+  dps: 809.48986
+  tps: 1060.05335
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 740.36548
-  tps: 753.09524
+  dps: 720.62194
+  tps: 733.16978
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1128.05618
-  tps: 1148.50077
+  dps: 1127.46891
+  tps: 1147.64309
  }
 }
 dps_results: {
@@ -1407,14 +1407,14 @@ dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
   dps: 43.90864
-  tps: 230.26047
+  tps: 230.16214
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Dwarf-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.7-4.0-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
   dps: 40.67209
-  tps: 49.98968
+  tps: 49.98477
  }
 }
 dps_results: {
@@ -1447,22 +1447,22 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 849.58514
-  tps: 1104.86863
+  dps: 848.09867
+  tps: 1099.6455
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 748.79742
-  tps: 761.56159
+  dps: 750.72042
+  tps: 763.32726
  }
 }
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-Settings-Human-p5twisting-P5 Seal of Martyrdom Ret-p5ret-twist-4DR-3.5-3.6-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1132.61852
-  tps: 1153.0877
+  dps: 1131.01619
+  tps: 1151.21495
  }
 }
 dps_results: {
@@ -1530,7 +1530,7 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3654.00244
-  tps: 3709.07164
+  dps: 3652.9564
+  tps: 3707.83862
  }
 }
diff --git a/sim/paladin/retribution/TestShockadin.results b/sim/paladin/retribution/TestShockadin.results
index 6df66449fc..fc9853650b 100644
--- a/sim/paladin/retribution/TestShockadin.results
+++ b/sim/paladin/retribution/TestShockadin.results
@@ -149,11 +149,11 @@ stat_weights_results: {
  key: "TestShockadin-Phase5-Lvl60-StatWeights-Default"
  value: {
   weights: 0.4241
-  weights: 1.62982
+  weights: 1.78808
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.07358
+  weights: 1.07355
   weights: 0
   weights: 0
   weights: 0
@@ -161,13 +161,13 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 12.93626
-  weights: 13.00706
+  weights: 13.00317
+  weights: 13.35753
   weights: 0
   weights: 0
   weights: 0.17525
-  weights: 16.07054
-  weights: 20.89782
+  weights: 16.415
+  weights: 21.2483
   weights: 0
   weights: 0
   weights: 0
@@ -198,56 +198,56 @@ dps_results: {
  key: "TestShockadin-Phase2-Lvl40-AllItems-Hero'sBrand-231328"
  value: {
   dps: 504.45966
-  tps: 528.8824
+  tps: 528.84909
  }
 }
 dps_results: {
  key: "TestShockadin-Phase2-Lvl40-AllItems-SoulforgeArmor"
  value: {
-  dps: 384.62424
-  tps: 404.61389
+  dps: 384.12299
+  tps: 403.81257
  }
 }
 dps_results: {
  key: "TestShockadin-Phase2-Lvl40-AllItems-ZandalarFreethinker'sBelt-231330"
  value: {
   dps: 446.50042
-  tps: 470.96124
+  tps: 470.88997
  }
 }
 dps_results: {
  key: "TestShockadin-Phase2-Lvl40-AllItems-ZandalarFreethinker'sBreastplate-231329"
  value: {
   dps: 500.67931
-  tps: 525.14701
+  tps: 525.12289
  }
 }
 dps_results: {
  key: "TestShockadin-Phase2-Lvl40-Average-Default"
  value: {
   dps: 512.07483
-  tps: 536.45752
+  tps: 536.41457
  }
 }
 dps_results: {
  key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 549.08359
-  tps: 828.54321
+  dps: 545.35166
+  tps: 824.0562
  }
 }
 dps_results: {
  key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 147.05159
-  tps: 161.02732
+  dps: 147.14497
+  tps: 161.04846
  }
 }
 dps_results: {
  key: "TestShockadin-Phase2-Lvl40-Settings-Dwarf-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 174.53791
-  tps: 190.42314
+  tps: 190.39564
  }
 }
 dps_results: {
@@ -274,22 +274,22 @@ dps_results: {
 dps_results: {
  key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 558.07583
-  tps: 838.76784
+  dps: 557.92089
+  tps: 837.05075
  }
 }
 dps_results: {
  key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 149.5925
-  tps: 163.67192
+  dps: 146.95012
+  tps: 160.91294
  }
 }
 dps_results: {
  key: "TestShockadin-Phase2-Lvl40-Settings-Human-p2retsom-P2 Seal of Martyrdom Shockadin-p2ret-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
   dps: 176.27547
-  tps: 192.20287
+  tps: 192.16162
  }
 }
 dps_results: {
@@ -317,63 +317,63 @@ dps_results: {
  key: "TestShockadin-Phase2-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
   dps: 480.61019
-  tps: 504.82395
+  tps: 504.7873
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-EmeraldEncrustedBattleplate"
  value: {
-  dps: 1349.17467
-  tps: 1395.05428
+  dps: 1345.50439
+  tps: 1391.17566
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sImbuedPlate"
  value: {
-  dps: 1349.24941
-  tps: 1394.67564
+  dps: 1335.57778
+  tps: 1380.18259
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-Knight-Lieutenant'sLamellarPlate"
  value: {
-  dps: 1387.46295
-  tps: 1433.08176
+  dps: 1367.49421
+  tps: 1412.12664
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-LibramofDraconicDestruction-221457"
  value: {
-  dps: 2789.57858
-  tps: 2870.30502
+  dps: 2762.26407
+  tps: 2841.32855
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-ObsessedProphet'sPlate"
  value: {
-  dps: 2393.68977
-  tps: 2477.78787
+  dps: 2360.32109
+  tps: 2442.5516
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-SanctifiedOrb-20512"
  value: {
   dps: 2991.68571
-  tps: 3076.2458
+  tps: 3075.992
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-AllItems-SoulforgeArmor"
  value: {
-  dps: 1250.91584
-  tps: 1287.11512
+  dps: 1226.89818
+  tps: 1261.96927
  }
 }
 dps_results: {
  key: "TestShockadin-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 3118.30438
-  tps: 3204.30705
+  dps: 3118.18223
+  tps: 3203.77093
  }
 }
 dps_results: {
@@ -464,6 +464,6 @@ dps_results: {
  key: "TestShockadin-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
   dps: 2939.70538
-  tps: 3024.22423
+  tps: 3023.9946
  }
 }
diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results
index 7d620514f4..6a6551d87f 100644
--- a/sim/shaman/enhancement/TestEnhancement.results
+++ b/sim/shaman/enhancement/TestEnhancement.results
@@ -295,12 +295,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestEnhancement-Phase2-Lvl40-StatWeights-Default"
  value: {
-  weights: 1.01355
-  weights: 0.85387
+  weights: 1.01354
+  weights: 0.85346
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.37163
+  weights: 0.37164
   weights: 0
   weights: 0
   weights: 0
@@ -313,8 +313,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0.4607
-  weights: 3.74921
-  weights: 7.30351
+  weights: 3.73667
+  weights: 7.28111
   weights: 0
   weights: 0
   weights: 0
@@ -345,7 +345,7 @@ stat_weights_results: {
  key: "TestEnhancement-Phase3-Lvl50-StatWeights-Default"
  value: {
   weights: 1.60272
-  weights: 0.76684
+  weights: 0.76683
   weights: 0
   weights: 0
   weights: 0
@@ -362,8 +362,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0.67455
-  weights: 6.66162
-  weights: 10.15542
+  weights: 6.62175
+  weights: 10.15468
   weights: 0
   weights: 0
   weights: 0
@@ -393,12 +393,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestEnhancement-Phase4-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.07698
-  weights: 0.3538
+  weights: 2.07498
+  weights: 0.50573
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.76267
+  weights: 0.76241
   weights: 0
   weights: 0
   weights: 0
@@ -410,9 +410,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.94408
-  weights: 28.51348
-  weights: 10.61673
+  weights: 0.94317
+  weights: 29.15617
+  weights: 10.97165
   weights: 0
   weights: 0
   weights: 0
@@ -442,12 +442,12 @@ stat_weights_results: {
 stat_weights_results: {
  key: "TestEnhancement-Phase5-Lvl60-StatWeights-Default"
  value: {
-  weights: 2.54804
-  weights: 1.02409
+  weights: 2.54559
+  weights: 1.01497
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.84153
+  weights: 0.84187
   weights: 0
   weights: 0
   weights: 0
@@ -459,9 +459,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.00713
-  weights: 21.62181
-  weights: 20.83491
+  weights: 1.00616
+  weights: 22.11553
+  weights: 21.04019
   weights: 0
   weights: 0
   weights: 0
@@ -673,463 +673,463 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Average-Default"
  value: {
-  dps: 814.76146
-  tps: 865.93326
+  dps: 814.75955
+  tps: 865.86165
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/FT-LongSingleTarget"
  value: {
   dps: 391.30896
-  tps: 430.15354
+  tps: 430.13048
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/FT-ShortSingleTarget"
  value: {
   dps: 389.17517
-  tps: 438.18413
+  tps: 438.18455
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 384.4187
-  tps: 436.35912
+  tps: 436.31391
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget"
  value: {
-  dps: 221.26227
-  tps: 249.16575
+  dps: 222.28753
+  tps: 250.16185
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-ShortSingleTarget"
  value: {
   dps: 243.12495
-  tps: 284.93816
+  tps: 284.92438
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 237.0815
-  tps: 278.78331
+  tps: 278.73282
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/FT-LongSingleTarget"
  value: {
   dps: 391.30896
-  tps: 430.15354
+  tps: 430.13048
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/FT-ShortSingleTarget"
  value: {
   dps: 389.17517
-  tps: 438.18413
+  tps: 438.18455
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 384.4187
-  tps: 436.35912
+  tps: 436.31391
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget"
  value: {
-  dps: 221.26227
-  tps: 249.16575
+  dps: 222.28753
+  tps: 250.16185
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-ShortSingleTarget"
  value: {
   dps: 243.12495
-  tps: 284.93816
+  tps: 284.92438
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Orc-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 237.0815
-  tps: 278.78331
+  tps: 278.73282
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/FT-LongSingleTarget"
  value: {
   dps: 392.51666
-  tps: 433.72614
+  tps: 433.63303
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/FT-ShortSingleTarget"
  value: {
   dps: 395.89207
-  tps: 443.83606
+  tps: 443.7821
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-FullBuffs-P2-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 395.19922
-  tps: 445.74898
+  tps: 445.38952
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget"
  value: {
-  dps: 218.61779
-  tps: 246.23554
+  dps: 219.37072
+  tps: 246.65469
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/FT-ShortSingleTarget"
  value: {
   dps: 246.63447
-  tps: 287.97215
+  tps: 287.95904
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Auto-phase_2-NoBuffs-P2-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 242.48748
-  tps: 283.62859
+  tps: 283.54525
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/FT-LongSingleTarget"
  value: {
   dps: 392.51666
-  tps: 433.72614
+  tps: 433.63303
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/FT-ShortSingleTarget"
  value: {
   dps: 395.89207
-  tps: 443.83606
+  tps: 443.7821
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-FullBuffs-P2-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 395.19922
-  tps: 445.74898
+  tps: 445.38952
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-LongSingleTarget"
  value: {
-  dps: 218.61779
-  tps: 246.23554
+  dps: 219.37072
+  tps: 246.65469
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/FT-ShortSingleTarget"
  value: {
   dps: 246.63447
-  tps: 287.97215
+  tps: 287.95904
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-Settings-Troll-phase_2-Sync Delay OH-phase_2-NoBuffs-P2-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 242.48748
-  tps: 283.62859
+  tps: 283.54525
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase2-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
   dps: 751.67928
-  tps: 799.08028
+  tps: 798.92317
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Average-Default"
  value: {
-  dps: 1719.8783
-  tps: 1259.29799
+  dps: 1719.73143
+  tps: 1259.19952
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/FT-LongSingleTarget"
  value: {
-  dps: 894.82892
-  tps: 661.19632
+  dps: 894.80026
+  tps: 661.09253
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/FT-ShortSingleTarget"
  value: {
-  dps: 898.59185
-  tps: 667.24574
+  dps: 898.44859
+  tps: 667.08629
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 897.83621
-  tps: 669.44683
+  dps: 897.68207
+  tps: 669.02054
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget"
  value: {
-  dps: 428.04996
-  tps: 324.80104
+  dps: 428.02822
+  tps: 324.78601
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-ShortSingleTarget"
  value: {
-  dps: 477.48136
-  tps: 369.44341
+  dps: 477.38598
+  tps: 369.37747
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 482.69696
-  tps: 373.63587
+  dps: 482.58901
+  tps: 373.56203
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/FT-LongSingleTarget"
  value: {
-  dps: 894.82892
-  tps: 661.19632
+  dps: 894.80026
+  tps: 661.09253
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/FT-ShortSingleTarget"
  value: {
-  dps: 898.59185
-  tps: 667.24574
+  dps: 898.44859
+  tps: 667.08629
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 897.83621
-  tps: 669.44683
+  dps: 897.68207
+  tps: 669.02054
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget"
  value: {
-  dps: 428.04996
-  tps: 324.80104
+  dps: 428.02822
+  tps: 324.78601
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-ShortSingleTarget"
  value: {
-  dps: 477.48136
-  tps: 369.44341
+  dps: 477.38598
+  tps: 369.37747
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Orc-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 482.69696
-  tps: 373.63587
+  dps: 482.58901
+  tps: 373.56203
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/FT-LongSingleTarget"
  value: {
-  dps: 891.20342
-  tps: 663.75741
+  dps: 891.17532
+  tps: 663.65418
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/FT-ShortSingleTarget"
  value: {
-  dps: 905.40002
-  tps: 673.14338
+  dps: 905.25956
+  tps: 672.88397
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-FullBuffs-P3-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 907.0933
-  tps: 674.85132
+  dps: 906.9406
+  tps: 674.67343
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget"
  value: {
-  dps: 419.12888
-  tps: 319.09561
+  dps: 419.10779
+  tps: 319.08108
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/FT-ShortSingleTarget"
  value: {
-  dps: 480.95359
-  tps: 373.33813
+  dps: 480.85813
+  tps: 373.2725
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Auto-phase_3-NoBuffs-P3-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 484.38608
-  tps: 373.68009
+  dps: 484.2794
+  tps: 373.60776
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/FT-LongSingleTarget"
  value: {
-  dps: 891.20342
-  tps: 663.75741
+  dps: 891.17532
+  tps: 663.65418
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/FT-ShortSingleTarget"
  value: {
-  dps: 905.40002
-  tps: 673.14338
+  dps: 905.25956
+  tps: 672.88397
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-FullBuffs-P3-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 907.0933
-  tps: 674.85132
+  dps: 906.9406
+  tps: 674.67343
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-LongSingleTarget"
  value: {
-  dps: 419.12888
-  tps: 319.09561
+  dps: 419.10779
+  tps: 319.08108
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/FT-ShortSingleTarget"
  value: {
-  dps: 480.95359
-  tps: 373.33813
+  dps: 480.85813
+  tps: 373.2725
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-Settings-Troll-phase_3-Sync Delay OH-phase_3-NoBuffs-P3-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 484.38608
-  tps: 373.68009
+  dps: 484.2794
+  tps: 373.60776
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase3-Lvl50-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1602.87656
-  tps: 1170.3
+  dps: 1602.98804
+  tps: 1170.47499
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 1852.7518
-  tps: 1876.97173
+  dps: 1851.65307
+  tps: 1876.06964
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 1921.62725
-  tps: 1944.53842
+  dps: 1920.47366
+  tps: 1943.59256
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 1977.28612
-  tps: 2005.38889
+  dps: 1976.34323
+  tps: 2004.6623
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 1898.24426
-  tps: 1922.49204
+  dps: 1897.14554
+  tps: 1921.44245
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 1852.27307
-  tps: 1876.6078
+  dps: 1851.17435
+  tps: 1875.55821
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 1899.34465
-  tps: 1922.76436
+  dps: 1898.2085
+  tps: 1921.67734
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 2799.92225
-  tps: 2856.77302
+  dps: 2798.9139
+  tps: 2856.00767
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 2741.56673
-  tps: 2799.17504
+  dps: 2740.59115
+  tps: 2798.17715
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 1519.94622
-  tps: 1551.74557
+  dps: 1515.63934
+  tps: 1548.20316
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3727.01887
-  tps: 2660.84459
+  dps: 3723.99979
+  tps: 2658.73994
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1669.85095
-  tps: 1687.07071
+  dps: 1669.36957
+  tps: 1684.94427
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
   dps: 1032.47835
-  tps: 746.93588
+  tps: 746.93537
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 1125.1506
-  tps: 746.73999
+  tps: 746.62409
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 693.93177
-  tps: 928.32862
+  dps: 693.09317
+  tps: 927.74159
  }
 }
 dps_results: {
@@ -1149,29 +1149,29 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1669.85095
-  tps: 1687.07071
+  dps: 1669.36957
+  tps: 1684.94427
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
   dps: 1032.47835
-  tps: 746.93588
+  tps: 746.93537
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 1125.1506
-  tps: 746.73999
+  tps: 746.62409
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 693.93177
-  tps: 928.32862
+  dps: 693.09317
+  tps: 927.74159
  }
 }
 dps_results: {
@@ -1191,36 +1191,36 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2927.63488
-  tps: 2571.40147
+  dps: 2926.1018
+  tps: 2572.28696
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1466.01391
-  tps: 1049.36773
+  dps: 1464.13752
+  tps: 1048.06051
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1542.82357
-  tps: 1038.94356
+  dps: 1542.10392
+  tps: 1038.17964
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1203.88611
-  tps: 1296.23234
+  dps: 1201.24215
+  tps: 1294.38157
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 607.39296
-  tps: 443.78927
+  dps: 607.06757
+  tps: 443.5615
  }
 }
 dps_results: {
@@ -1233,36 +1233,36 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2927.63488
-  tps: 2571.40147
+  dps: 2926.1018
+  tps: 2572.28696
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1466.01391
-  tps: 1049.36773
+  dps: 1464.13752
+  tps: 1048.06051
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1542.82357
-  tps: 1038.94356
+  dps: 1542.10392
+  tps: 1038.17964
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1203.88611
-  tps: 1296.23234
+  dps: 1201.24215
+  tps: 1294.38157
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Orc-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 607.39296
-  tps: 443.78927
+  dps: 607.06757
+  tps: 443.5615
  }
 }
 dps_results: {
@@ -1275,29 +1275,29 @@ 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: 1671.06895
-  tps: 1691.51377
+  dps: 1670.60536
+  tps: 1688.7607
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
   dps: 1036.75287
-  tps: 749.97943
+  tps: 750.03649
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 1124.475
-  tps: 746.79022
+  tps: 746.7558
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 690.63595
-  tps: 926.97506
+  dps: 690.17314
+  tps: 926.6511
  }
 }
 dps_results: {
@@ -1317,29 +1317,29 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1671.06895
-  tps: 1691.51377
+  dps: 1670.60536
+  tps: 1688.7607
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
   dps: 1036.75287
-  tps: 749.97943
+  tps: 750.03649
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 1124.475
-  tps: 746.79022
+  tps: 746.7558
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_2h-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 690.63595
-  tps: 926.97506
+  dps: 690.17314
+  tps: 926.6511
  }
 }
 dps_results: {
@@ -1359,36 +1359,36 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2916.69135
-  tps: 2571.76677
+  dps: 2914.37135
+  tps: 2569.31348
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1454.9973
-  tps: 1041.63347
+  dps: 1452.73493
+  tps: 1040.25384
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1540.89719
-  tps: 1037.00327
+  dps: 1540.17885
+  tps: 1036.31656
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1186.94202
-  tps: 1285.37366
+  dps: 1184.37147
+  tps: 1283.61319
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Auto-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 599.33811
-  tps: 438.27696
+  dps: 599.02874
+  tps: 438.06039
  }
 }
 dps_results: {
@@ -1401,36 +1401,36 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2916.69135
-  tps: 2571.76677
+  dps: 2914.37135
+  tps: 2569.31348
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1454.9973
-  tps: 1041.63347
+  dps: 1452.73493
+  tps: 1040.25384
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1540.89719
-  tps: 1037.00327
+  dps: 1540.17885
+  tps: 1036.31656
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1186.94202
-  tps: 1285.37366
+  dps: 1184.37147
+  tps: 1283.61319
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-Settings-Troll-phase_4_dw-Sync Delay OH-phase_4-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 599.33811
-  tps: 438.27696
+  dps: 599.02874
+  tps: 438.06039
  }
 }
 dps_results: {
@@ -1443,113 +1443,113 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3009.12902
-  tps: 2149.89361
+  dps: 3007.68156
+  tps: 2149.26574
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 1999.58803
-  tps: 2019.5108
+  dps: 1997.12414
+  tps: 2017.18925
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 2078.82144
-  tps: 2097.2862
+  dps: 2076.21948
+  tps: 2094.74392
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 2103.53929
-  tps: 2123.3823
+  dps: 2100.03643
+  tps: 2118.96796
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 2049.43948
-  tps: 2069.06915
+  dps: 2047.12287
+  tps: 2066.67504
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 1998.59259
-  tps: 2018.61918
+  dps: 1996.26941
+  tps: 2016.23181
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 2046.73016
-  tps: 2065.84099
+  dps: 2044.3276
+  tps: 2063.37721
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 3236.89059
-  tps: 3296.63851
+  dps: 3235.76442
+  tps: 3295.39059
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 3171.47178
-  tps: 3233.7368
+  dps: 3170.4161
+  tps: 3232.55366
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 1616.84895
-  tps: 1649.5835
+  dps: 1607.28017
+  tps: 1640.61207
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 4343.96679
-  tps: 3094.8341
+  dps: 4339.68074
+  tps: 3091.84096
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2119.18437
-  tps: 2033.87862
+  dps: 2117.39563
+  tps: 2031.59923
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1349.22645
-  tps: 962.33718
+  dps: 1348.77372
+  tps: 962.04254
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 1460.34954
-  tps: 978.0777
+  tps: 978.05626
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 846.45522
-  tps: 1057.5323
+  dps: 845.64911
+  tps: 1057.05145
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 564.82704
-  tps: 413.77702
+  dps: 564.63341
+  tps: 413.64148
  }
 }
 dps_results: {
@@ -1562,36 +1562,36 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2119.18437
-  tps: 2033.87862
+  dps: 2117.39563
+  tps: 2031.59923
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1349.22645
-  tps: 962.33718
+  dps: 1348.77372
+  tps: 962.04254
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 1460.34954
-  tps: 978.0777
+  tps: 978.05626
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 846.45522
-  tps: 1057.5323
+  dps: 845.64911
+  tps: 1057.05145
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 564.82704
-  tps: 413.77702
+  dps: 564.63341
+  tps: 413.64148
  }
 }
 dps_results: {
@@ -1604,120 +1604,120 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 3425.75126
-  tps: 2936.79101
+  dps: 3423.41376
+  tps: 2935.52768
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1593.71315
-  tps: 1139.72596
+  dps: 1590.40366
+  tps: 1137.49502
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1791.06823
-  tps: 1214.1616
+  dps: 1787.27535
+  tps: 1211.82205
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1456.46091
-  tps: 1586.54515
+  dps: 1453.41806
+  tps: 1584.50897
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 651.34787
-  tps: 477.09898
+  dps: 650.74414
+  tps: 476.80711
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 815.96838
-  tps: 560.45825
+  dps: 815.32832
+  tps: 560.01021
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 3425.75126
-  tps: 2936.79101
+  dps: 3423.41376
+  tps: 2935.52768
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1593.71315
-  tps: 1139.72596
+  dps: 1590.40366
+  tps: 1137.49502
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1791.06823
-  tps: 1214.1616
+  dps: 1787.27535
+  tps: 1211.82205
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1456.46091
-  tps: 1586.54515
+  dps: 1453.41806
+  tps: 1584.50897
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 651.34787
-  tps: 477.09898
+  dps: 650.74414
+  tps: 476.80711
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Orc-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 815.96838
-  tps: 560.45825
+  dps: 815.32832
+  tps: 560.01021
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2093.97225
-  tps: 2016.17249
+  dps: 2092.18636
+  tps: 2013.92186
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1342.29947
-  tps: 960.24885
+  dps: 1341.84745
+  tps: 959.9333
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 1458.57012
-  tps: 975.72463
+  tps: 975.5921
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 840.14091
-  tps: 1054.76214
+  dps: 839.29295
+  tps: 1054.16857
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 561.07511
-  tps: 411.51312
+  dps: 560.88186
+  tps: 411.37785
  }
 }
 dps_results: {
@@ -1730,36 +1730,36 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 2093.97225
-  tps: 2016.17249
+  dps: 2092.18636
+  tps: 2013.92186
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1342.29947
-  tps: 960.24885
+  dps: 1341.84745
+  tps: 959.9333
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
   dps: 1458.57012
-  tps: 975.72463
+  tps: 975.5921
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 840.14091
-  tps: 1054.76214
+  dps: 839.29295
+  tps: 1054.16857
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_2h-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 561.07511
-  tps: 411.51312
+  dps: 560.88186
+  tps: 411.37785
  }
 }
 dps_results: {
@@ -1772,91 +1772,91 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 3404.80514
-  tps: 2930.56885
+  dps: 3402.29336
+  tps: 2929.76563
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1580.61195
-  tps: 1130.52077
+  dps: 1577.98543
+  tps: 1128.72443
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1791.06889
-  tps: 1214.24982
+  dps: 1787.28214
+  tps: 1211.90503
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1447.39856
-  tps: 1582.57062
+  dps: 1444.01338
+  tps: 1580.39311
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 645.09156
-  tps: 471.59117
+  dps: 644.96382
+  tps: 471.50176
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Auto-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 815.15181
-  tps: 560.2846
+  dps: 814.51315
+  tps: 559.83754
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 3404.80514
-  tps: 2930.56885
+  dps: 3402.29336
+  tps: 2929.76563
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 1580.61195
-  tps: 1130.52077
+  dps: 1577.98543
+  tps: 1128.72443
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-FullBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 1791.06889
-  tps: 1214.24982
+  dps: 1787.28214
+  tps: 1211.90503
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongMultiTarget"
  value: {
-  dps: 1447.39856
-  tps: 1582.57062
+  dps: 1444.01338
+  tps: 1580.39311
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-LongSingleTarget"
  value: {
-  dps: 645.09156
-  tps: 471.59117
+  dps: 644.96382
+  tps: 471.50176
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-Settings-Troll-phase_5_dw-Sync Delay OH-phase_5-NoBuffs-P4-Consumes WF/WF-ShortSingleTarget"
  value: {
-  dps: 815.15181
-  tps: 560.2846
+  dps: 814.51315
+  tps: 559.83754
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3595.56713
-  tps: 2560.78917
+  dps: 3594.83005
+  tps: 2560.42548
  }
 }
diff --git a/sim/shaman/warden/TestWardenShaman.results b/sim/shaman/warden/TestWardenShaman.results
index ba5aa01407..a83095cf16 100644
--- a/sim/shaman/warden/TestWardenShaman.results
+++ b/sim/shaman/warden/TestWardenShaman.results
@@ -50,12 +50,12 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestWardenShaman-Phase4-Lvl60-StatWeights-Default"
  value: {
-  weights: 1.10932
+  weights: 1.10709
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.48912
+  weights: 0.48758
   weights: 0
   weights: 0
   weights: 0
@@ -67,7 +67,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.50424
+  weights: 0.50322
   weights: 0
   weights: 0
   weights: 0
@@ -78,7 +78,7 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.95156
+  weights: 0.94812
   weights: 0
   weights: 0
   weights: 0
@@ -99,154 +99,154 @@ stat_weights_results: {
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 1129.94069
-  tps: 1170.85583
+  dps: 1129.45538
+  tps: 1170.54804
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 1177.8457
-  tps: 1217.31605
+  dps: 1177.31269
+  tps: 1216.89486
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 1173.3511
-  tps: 1216.52447
+  dps: 1170.38676
+  tps: 1213.41062
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 1157.42115
-  tps: 1198.30393
+  dps: 1156.94948
+  tps: 1197.98387
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 1129.77343
-  tps: 1170.37051
+  dps: 1129.28813
+  tps: 1170.02297
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 1162.54975
-  tps: 1202.28613
+  dps: 1162.03191
+  tps: 1201.90605
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 1733.08466
-  tps: 1923.57747
+  dps: 1733.09486
+  tps: 1923.79469
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 1034.3827
-  tps: 1066.5359
+  dps: 1031.91261
+  tps: 1064.15773
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 1948.47779
-  tps: 1562.75187
+  dps: 1945.48666
+  tps: 1558.48667
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2081.56478
-  tps: 2990.62865
+  dps: 2060.07253
+  tps: 2964.93738
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 920.0437
-  tps: 799.96446
+  dps: 915.3125
+  tps: 797.19719
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 1236.59923
-  tps: 1051.06433
+  tps: 1050.9955
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 653.48127
-  tps: 1176.38134
+  dps: 653.20384
+  tps: 1176.27589
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 325.65211
-  tps: 269.18446
+  dps: 325.58904
+  tps: 269.14031
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Orc-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 520.00461
-  tps: 419.10869
+  dps: 519.68926
+  tps: 418.88795
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2035.36525
-  tps: 2932.53848
+  dps: 2041.98474
+  tps: 2938.67285
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 915.40503
-  tps: 793.23907
+  dps: 914.06275
+  tps: 794.95484
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
   dps: 1222.70234
-  tps: 1044.62111
+  tps: 1044.51786
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 642.07315
-  tps: 1157.28113
+  dps: 641.75682
+  tps: 1157.14176
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 319.32392
-  tps: 263.5509
+  dps: 319.26101
+  tps: 263.50687
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-Settings-Troll-phase_4_enh_tank-Default-phase_4_enh_tank-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 503.36997
-  tps: 403.7
+  dps: 503.05545
+  tps: 403.47983
  }
 }
 dps_results: {
  key: "TestWardenShaman-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1681.29413
-  tps: 1366.44048
+  dps: 1676.85039
+  tps: 1363.68216
  }
 }
diff --git a/sim/shaman/windfury_weapon.go b/sim/shaman/windfury_weapon.go
index 6a059f8a1b..3bec7c6167 100644
--- a/sim/shaman/windfury_weapon.go
+++ b/sim/shaman/windfury_weapon.go
@@ -94,7 +94,7 @@ func (shaman *Shaman) RegisterWindfuryImbue(procMask core.ProcMask) {
 			aura.Activate(sim)
 		},
 		OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
-			if !result.Landed() || !spell.ProcMask.Matches(procMask) {
+			if !result.Landed() || !spell.ProcMask.Matches(procMask) || spell.Flags.Matches(core.SpellFlagSuppressEquipProcs) {
 				return
 			}