diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results
index 83288e2835..c0d6985001 100644
--- a/sim/warrior/dps/TestArms.results
+++ b/sim/warrior/dps/TestArms.results
@@ -45,616 +45,616 @@ character_stats_results: {
 dps_results: {
  key: "TestArms-AllItems-AshtongueTalismanofValor-32485"
  value: {
-  dps: 7979.83169
-  tps: 6522.32996
+  dps: 7939.35901
+  tps: 6486.58396
  }
 }
 dps_results: {
  key: "TestArms-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 8166.29729
-  tps: 6675.40683
+  dps: 8179.38014
+  tps: 6688.22117
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 8155.80396
-  tps: 6657.83477
+  dps: 8091.88076
+  tps: 6610.11543
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 8215.2016
-  tps: 6718.67999
+  dps: 8209.6753
+  tps: 6715.06378
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 8089.43561
-  tps: 6608.79252
+  dps: 8093.11402
+  tps: 6615.39913
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 6787.172
-  tps: 5552.495
+  dps: 6817.44537
+  tps: 5573.63629
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 6773.20787
-  tps: 5540.62613
+  dps: 6799.57557
+  tps: 5568.41617
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 6449.04748
-  tps: 5277.71343
+  dps: 6527.26197
+  tps: 5343.57823
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6537.98033
+  dps: 8168.56851
+  tps: 6544.836
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 8363.64339
-  tps: 6839.84826
+  dps: 8395.42139
+  tps: 6861.48426
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 8107.38488
-  tps: 6626.60986
+  dps: 8101.74894
+  tps: 6621.34198
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 8137.42283
-  tps: 6650.40386
+  dps: 8154.36887
+  tps: 6663.24905
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Greatness-44253"
  value: {
-  dps: 8057.5775
-  tps: 6585.95992
+  dps: 8081.78753
+  tps: 6605.44507
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Greatness-44254"
  value: {
-  dps: 7942.45768
-  tps: 6489.04909
+  dps: 7913.99657
+  tps: 6465.19675
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 8056.92846
-  tps: 6585.24522
+  dps: 8050.03554
+  tps: 6579.406
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7973.60336
-  tps: 6515.55596
+  dps: 7963.34017
+  tps: 6506.65975
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 8215.38087
-  tps: 6718.64594
+  dps: 8206.55174
+  tps: 6713.57141
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DreadnaughtBattlegear"
  value: {
-  dps: 7206.97018
-  tps: 5896.65117
+  dps: 7227.00049
+  tps: 5912.35074
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 8215.2016
-  tps: 6718.67999
+  dps: 8209.6753
+  tps: 6715.06378
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 8210.08306
-  tps: 6714.37545
+  dps: 8204.3409
+  tps: 6711.77282
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 8150.88278
-  tps: 6660.78034
+  dps: 8162.71953
+  tps: 6669.37543
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 8095.09668
-  tps: 6616.80896
+  dps: 8109.71551
+  tps: 6628.39839
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForgeEmber-37660"
  value: {
-  dps: 8064.27294
-  tps: 6591.06623
+  dps: 8089.45877
+  tps: 6612.42603
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 8167.07549
-  tps: 6670.86936
+  dps: 8160.38526
+  tps: 6667.4639
  }
 }
 dps_results: {
  key: "TestArms-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7942.45768
-  tps: 6489.04909
+  dps: 7913.99657
+  tps: 6465.19675
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Gladiator'sBattlegear"
  value: {
-  dps: 7890.44216
-  tps: 6440.4999
+  dps: 7892.1679
+  tps: 6445.72531
  }
 }
 dps_results: {
  key: "TestArms-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7942.45768
-  tps: 6489.04909
+  dps: 7913.99657
+  tps: 6465.19675
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 8215.2016
-  tps: 6718.67999
+  dps: 8209.6753
+  tps: 6715.06378
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 8210.08306
-  tps: 6714.37545
+  dps: 8204.3409
+  tps: 6711.77282
  }
 }
 dps_results: {
  key: "TestArms-AllItems-IncisorFragment-37723"
  value: {
-  dps: 8157.77781
-  tps: 6665.72373
+  dps: 8166.36047
+  tps: 6675.44674
  }
 }
 dps_results: {
  key: "TestArms-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 8206.37105
-  tps: 6707.57565
+  dps: 8193.63955
+  tps: 6699.07727
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7942.45768
-  tps: 6489.04909
+  dps: 7913.99657
+  tps: 6465.19675
  }
 }
 dps_results: {
  key: "TestArms-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7942.45768
-  tps: 6489.04909
+  dps: 7913.99657
+  tps: 6465.19675
  }
 }
 dps_results: {
  key: "TestArms-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 8100.14413
-  tps: 6621.48
+  dps: 8206.52594
+  tps: 6706.92467
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7955.37967
-  tps: 6500.38168
+  dps: 7922.44487
+  tps: 6471.9671
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OnslaughtArmor"
  value: {
-  dps: 5456.86919
-  tps: 4460.70195
+  dps: 5528.45966
+  tps: 4522.99951
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OnslaughtBattlegear"
  value: {
-  dps: 6335.66278
-  tps: 5172.7692
+  dps: 6367.67504
+  tps: 5198.6024
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 8194.59988
-  tps: 6698.33172
+  dps: 8202.53131
+  tps: 6706.94904
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 8206.37105
-  tps: 6707.57565
+  dps: 8193.63955
+  tps: 6699.07727
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7942.45768
-  tps: 6489.04909
+  dps: 7913.99657
+  tps: 6465.19675
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7942.45768
-  tps: 6489.04909
+  dps: 7913.99657
+  tps: 6465.19675
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7942.45768
-  tps: 6489.04909
+  dps: 7913.99657
+  tps: 6465.19675
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 8364.24124
-  tps: 6840.13044
+  dps: 8395.24484
+  tps: 6860.36023
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7942.45768
-  tps: 6489.04909
+  dps: 7913.99657
+  tps: 6465.19675
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7959.69859
-  tps: 6504.13957
+  dps: 7939.70413
+  tps: 6484.40548
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7942.45768
-  tps: 6489.04909
+  dps: 7913.99657
+  tps: 6465.19675
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SiegebreakerBattlegear"
  value: {
-  dps: 7558.01704
-  tps: 6180.30054
+  dps: 7626.82866
+  tps: 6238.17841
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7942.45768
-  tps: 6489.04909
+  dps: 7913.99657
+  tps: 6465.19675
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SparkofLife-37657"
  value: {
-  dps: 8011.86429
-  tps: 6547.69073
+  dps: 8085.2399
+  tps: 6607.14856
  }
 }
 dps_results: {
  key: "TestArms-AllItems-StormshroudArmor"
  value: {
-  dps: 6364.53705
-  tps: 5202.96551
+  dps: 6439.91315
+  tps: 5266.26736
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 8206.37105
-  tps: 6707.57565
+  dps: 8193.63955
+  tps: 6699.07727
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 8194.59988
-  tps: 6698.33172
+  dps: 8202.53131
+  tps: 6706.94904
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 8189.72463
-  tps: 6693.88374
+  dps: 8186.43421
+  tps: 6693.07627
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheFistsofFury"
  value: {
-  dps: 4782.81027
-  tps: 3990.64266
+  dps: 4781.65299
+  tps: 3990.05938
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5137.16989
-  tps: 4286.22586
+  dps: 5146.75548
+  tps: 4295.35713
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 8222.89154
-  tps: 6725.08104
+  dps: 8272.18414
+  tps: 6764.34897
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 8368.39856
-  tps: 6839.03239
+  dps: 8367.55497
+  tps: 6843.58425
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 8419.46268
-  tps: 6885.34033
+  dps: 8423.46978
+  tps: 6888.44156
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 8159.90688
-  tps: 6671.25893
+  dps: 8168.56851
+  tps: 6678.25474
  }
 }
 dps_results: {
  key: "TestArms-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6830.90798
-  tps: 5588.61108
+  dps: 6805.57089
+  tps: 5566.94379
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Wrynn'sBattlegear"
  value: {
-  dps: 7996.57025
-  tps: 6532.55955
+  dps: 8047.97522
+  tps: 6573.37512
  }
 }
 dps_results: {
  key: "TestArms-AllItems-YmirjarLord'sBattlegear"
  value: {
-  dps: 8425.0971
-  tps: 6898.75017
+  dps: 8520.32167
+  tps: 6983.54157
  }
 }
 dps_results: {
  key: "TestArms-Average-Default"
  value: {
-  dps: 8388.83617
-  tps: 6860.29312
+  dps: 8428.17775
+  tps: 6894.90627
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 11070.38738
-  tps: 9483.23759
+  dps: 10977.21481
+  tps: 9411.01101
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 8340.85588
-  tps: 6818.79138
+  dps: 8302.32054
+  tps: 6785.6499
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9048.06154
-  tps: 7467.0401
+  dps: 9093.97892
+  tps: 7502.00739
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 6367.28088
-  tps: 5586.02608
+  dps: 6365.31806
+  tps: 5583.58486
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4445.14894
-  tps: 3643.26895
+  dps: 4456.8162
+  tps: 3654.26009
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4421.77019
-  tps: 3651.03955
+  dps: 4408.93878
+  tps: 3635.16743
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 11131.00919
-  tps: 9532.42444
+  dps: 11139.3294
+  tps: 9549.2145
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 8364.24124
-  tps: 6840.13044
+  dps: 8395.24484
+  tps: 6860.36023
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9112.91346
-  tps: 7520.34438
+  dps: 9184.26974
+  tps: 7574.79038
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 6370.10949
-  tps: 5589.31709
+  dps: 6411.95629
+  tps: 5623.26148
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4514.75663
-  tps: 3701.70359
+  dps: 4509.52859
+  tps: 3694.02134
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4516.69299
-  tps: 3726.64566
+  dps: 4514.99827
+  tps: 3727.20095
  }
 }
 dps_results: {
  key: "TestArms-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7754.6099
-  tps: 6331.79176
+  dps: 7796.72685
+  tps: 6366.2785
  }
 }
diff --git a/sim/warrior/dps/TestFury.results b/sim/warrior/dps/TestFury.results
index 9b95f56568..143585c580 100644
--- a/sim/warrior/dps/TestFury.results
+++ b/sim/warrior/dps/TestFury.results
@@ -45,616 +45,616 @@ character_stats_results: {
 dps_results: {
  key: "TestFury-AllItems-AshtongueTalismanofValor-32485"
  value: {
-  dps: 6454.8662
-  tps: 4744.40209
+  dps: 6564.46577
+  tps: 4827.94344
  }
 }
 dps_results: {
  key: "TestFury-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 6523.38256
-  tps: 4795.51183
+  dps: 6634.25839
+  tps: 4880.22106
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 6596.31995
-  tps: 4844.6147
+  dps: 6729.02115
+  tps: 4949.05938
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 6552.964
-  tps: 4815.8013
+  dps: 6664.08399
+  tps: 4901.5595
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 6400.94241
-  tps: 4706.11622
+  dps: 6445.20705
+  tps: 4741.95307
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 5261.17841
-  tps: 3882.45665
+  dps: 5267.37173
+  tps: 3893.11052
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 5175.83373
-  tps: 3815.85553
+  dps: 5250.93575
+  tps: 3878.18918
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 4954.83858
-  tps: 3659.37022
+  dps: 4959.89052
+  tps: 3669.12863
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4695.65001
+  dps: 6641.15023
+  tps: 4787.24944
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 6656.01982
-  tps: 4890.76256
+  dps: 6795.7451
+  tps: 4997.94543
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 6569.54551
-  tps: 4826.11044
+  dps: 6678.05931
+  tps: 4910.45907
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 6601.66467
-  tps: 4849.74839
+  dps: 6692.25342
+  tps: 4920.57649
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Greatness-44253"
  value: {
-  dps: 6500.6494
-  tps: 4779.06707
+  dps: 6612.81047
+  tps: 4866.26847
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Greatness-44254"
  value: {
-  dps: 6397.89223
-  tps: 4704.31265
+  dps: 6517.45265
+  tps: 4795.43945
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 6493.41315
-  tps: 4770.8295
+  dps: 6621.04635
+  tps: 4869.97175
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Defender'sCode-40257"
  value: {
-  dps: 6412.99891
-  tps: 4714.68252
+  dps: 6547.473
+  tps: 4813.35509
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 6547.82812
-  tps: 4812.3621
+  dps: 6680.13944
+  tps: 4912.13223
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DreadnaughtBattlegear"
  value: {
-  dps: 5719.0739
-  tps: 4217.20872
+  dps: 5811.64988
+  tps: 4287.50719
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 6552.964
-  tps: 4815.8013
+  dps: 6664.08399
+  tps: 4901.5595
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 6544.83732
-  tps: 4810.02445
+  dps: 6668.14778
+  tps: 4903.87423
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 6599.23186
-  tps: 4848.02419
+  dps: 6697.92133
+  tps: 4924.43593
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6543.98417
-  tps: 4808.44182
+  dps: 6655.14875
+  tps: 4894.95622
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6497.72039
-  tps: 4777.00053
+  dps: 6632.46945
+  tps: 4880.36834
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 6609.61599
-  tps: 4855.91997
+  dps: 6707.44966
+  tps: 4932.39427
  }
 }
 dps_results: {
  key: "TestFury-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6397.89223
-  tps: 4704.31265
+  dps: 6517.45265
+  tps: 4795.43945
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Gladiator'sBattlegear"
  value: {
-  dps: 6280.92043
-  tps: 4616.10864
+  dps: 6442.03214
+  tps: 4738.20709
  }
 }
 dps_results: {
  key: "TestFury-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6397.89223
-  tps: 4704.31265
+  dps: 6517.45265
+  tps: 4795.43945
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 6552.964
-  tps: 4815.8013
+  dps: 6664.08399
+  tps: 4901.5595
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 6544.83732
-  tps: 4810.02445
+  dps: 6668.14778
+  tps: 4903.87423
  }
 }
 dps_results: {
  key: "TestFury-AllItems-IncisorFragment-37723"
  value: {
-  dps: 6607.45346
-  tps: 4855.35145
+  dps: 6744.86788
+  tps: 4959.77368
  }
 }
 dps_results: {
  key: "TestFury-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 6542.95503
-  tps: 4809.6138
+  dps: 6678.44659
+  tps: 4915.58039
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 6397.89223
-  tps: 4704.31265
+  dps: 6517.45265
+  tps: 4795.43945
  }
 }
 dps_results: {
  key: "TestFury-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6397.89223
-  tps: 4704.31265
+  dps: 6517.45265
+  tps: 4795.43945
  }
 }
 dps_results: {
  key: "TestFury-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 6624.21339
-  tps: 4866.00919
+  dps: 6738.11371
+  tps: 4953.5044
  }
 }
 dps_results: {
  key: "TestFury-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 6407.44669
-  tps: 4710.68931
+  dps: 6541.21409
+  tps: 4809.12529
  }
 }
 dps_results: {
  key: "TestFury-AllItems-OnslaughtArmor"
  value: {
-  dps: 4021.41808
-  tps: 2980.05549
+  dps: 4021.05135
+  tps: 2982.80494
  }
 }
 dps_results: {
  key: "TestFury-AllItems-OnslaughtBattlegear"
  value: {
-  dps: 4768.76084
-  tps: 3526.92904
+  dps: 4838.99417
+  tps: 3579.85645
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 6544.7056
-  tps: 4810.2846
+  dps: 6669.21583
+  tps: 4907.05464
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 6542.95503
-  tps: 4809.6138
+  dps: 6678.44659
+  tps: 4915.58039
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 6397.89223
-  tps: 4704.31265
+  dps: 6517.45265
+  tps: 4795.43945
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6397.89223
-  tps: 4704.31265
+  dps: 6517.45265
+  tps: 4795.43945
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6397.89223
-  tps: 4704.31265
+  dps: 6517.45265
+  tps: 4795.43945
  }
 }
 dps_results: {
  key: "TestFury-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 6654.52106
-  tps: 4889.23464
+  dps: 6792.72515
+  tps: 4995.58071
  }
 }
 dps_results: {
  key: "TestFury-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 6397.89223
-  tps: 4704.31265
+  dps: 6517.45265
+  tps: 4795.43945
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 6409.0786
-  tps: 4712.25067
+  dps: 6556.45195
+  tps: 4821.82691
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 6397.89223
-  tps: 4704.31265
+  dps: 6517.45265
+  tps: 4795.43945
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SiegebreakerBattlegear"
  value: {
-  dps: 6063.97785
-  tps: 4462.1231
+  dps: 6134.6011
+  tps: 4517.90468
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 6397.89223
-  tps: 4704.31265
+  dps: 6517.45265
+  tps: 4795.43945
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SparkofLife-37657"
  value: {
-  dps: 6509.04056
-  tps: 4781.57362
+  dps: 6605.69931
+  tps: 4861.43123
  }
 }
 dps_results: {
  key: "TestFury-AllItems-StormshroudArmor"
  value: {
-  dps: 4880.64582
-  tps: 3606.29292
+  dps: 4910.61035
+  tps: 3631.25386
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 6542.95503
-  tps: 4809.6138
+  dps: 6678.44659
+  tps: 4915.58039
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 6544.7056
-  tps: 4810.2846
+  dps: 6669.21583
+  tps: 4907.05464
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 6535.98597
-  tps: 4803.85647
+  dps: 6640.98724
+  tps: 4884.44406
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TheFistsofFury"
  value: {
-  dps: 5012.70895
-  tps: 3697.80491
+  dps: 5050.71014
+  tps: 3727.25837
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5252.5558
-  tps: 3868.8724
+  dps: 5271.27567
+  tps: 3884.19723
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6594.78223
-  tps: 4845.60695
+  dps: 6686.97703
+  tps: 4918.89993
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 6683.09573
-  tps: 4904.90775
+  dps: 6807.34549
+  tps: 5006.15653
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 6673.60128
-  tps: 4902.93632
+  dps: 6825.97364
+  tps: 5017.99239
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 6517.7785
-  tps: 4791.29478
+  dps: 6641.15023
+  tps: 4884.73916
  }
 }
 dps_results: {
  key: "TestFury-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 5194.92439
-  tps: 3832.9974
+  dps: 5242.66174
+  tps: 3871.98643
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Wrynn'sBattlegear"
  value: {
-  dps: 6446.31694
-  tps: 4738.56226
+  dps: 6516.54449
+  tps: 4791.17289
  }
 }
 dps_results: {
  key: "TestFury-AllItems-YmirjarLord'sBattlegear"
  value: {
-  dps: 7009.91129
-  tps: 5159.35906
+  dps: 7108.47891
+  tps: 5233.75565
  }
 }
 dps_results: {
  key: "TestFury-Average-Default"
  value: {
-  dps: 6719.46802
-  tps: 4934.50564
+  dps: 6845.81002
+  tps: 5035.18865
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 8515.76548
-  tps: 6684.0116
+  dps: 8694.50728
+  tps: 6836.48688
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6545.41582
-  tps: 4811.41
+  dps: 6611.71602
+  tps: 4867.29127
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7547.47204
-  tps: 5523.34475
+  dps: 7729.58083
+  tps: 5663.9409
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 4696.72578
-  tps: 3873.96856
+  dps: 4720.53689
+  tps: 3892.71836
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3244.99183
-  tps: 2415.74513
+  dps: 3251.62764
+  tps: 2422.72537
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3442.84181
-  tps: 2559.9772
+  dps: 3476.40323
+  tps: 2587.32537
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 8752.59615
-  tps: 6855.62536
+  dps: 8899.97436
+  tps: 6995.20853
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6654.52106
-  tps: 4889.23464
+  dps: 6792.72515
+  tps: 4995.58071
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7764.8676
-  tps: 5670.46643
+  dps: 7838.92004
+  tps: 5739.56327
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 4865.95033
-  tps: 4004.05541
+  dps: 4837.22027
+  tps: 3980.92638
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3331.86225
-  tps: 2482.34258
+  dps: 3314.29807
+  tps: 2469.90112
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3573.89564
-  tps: 2659.10741
+  dps: 3508.91135
+  tps: 2613.37931
  }
 }
 dps_results: {
  key: "TestFury-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6072.03487
-  tps: 4465.21666
+  dps: 6210.86439
+  tps: 4577.61965
  }
 }
diff --git a/sim/warrior/slam.go b/sim/warrior/slam.go
index 9afe8ff4bb..4cccbdddd7 100644
--- a/sim/warrior/slam.go
+++ b/sim/warrior/slam.go
@@ -44,7 +44,6 @@ func (warrior *Warrior) registerSlamSpell() {
 			if !result.Landed() {
 				warrior.AddRage(sim, refundAmount, warrior.RageRefundMetrics)
 			}
-			warrior.disableHsCleaveUntil = sim.CurrentTime + spell.DefaultCast.CastTime
 		},
 	})
 }
@@ -64,5 +63,6 @@ func (warrior *Warrior) CastSlam(sim *core.Simulation, target *core.Unit) bool {
 		warrior.AutoAttacks.DelayOffhandMeleeUntil(sim, warrior.AutoAttacks.OffhandSwingAt+warrior.Slam.DefaultCast.CastTime)
 	}
 
+	warrior.disableHsCleaveUntil = sim.CurrentTime + warrior.Slam.DefaultCast.CastTime
 	return warrior.Slam.Cast(sim, target)
 }