diff --git a/sim/warrior/dps/TestArms.results b/sim/warrior/dps/TestArms.results
index 095e5d6317..39a3ec1dcb 100644
--- a/sim/warrior/dps/TestArms.results
+++ b/sim/warrior/dps/TestArms.results
@@ -46,66 +46,66 @@ character_stats_results: {
 dps_results: {
  key: "TestArms-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-AshtongueTalismanofValor-32485"
  value: {
-  dps: 7705.32441
-  tps: 6334.46443
+  dps: 7704.28719
+  tps: 6332.4339
  }
 }
 dps_results: {
  key: "TestArms-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 8014.96258
-  tps: 6585.77757
+  dps: 8029.41089
+  tps: 6597.13728
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 7875.95878
-  tps: 6468.12499
+  dps: 7875.95879
+  tps: 6468.12626
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
   hps: 90.47701
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
   hps: 90.47701
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 8028.25824
-  tps: 6597.7899
+  dps: 8041.16872
+  tps: 6607.42769
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 7814.37393
-  tps: 6418.43475
+  dps: 7817.09362
+  tps: 6420.13704
  }
 }
 dps_results: {
@@ -118,8 +118,8 @@ dps_results: {
 dps_results: {
  key: "TestArms-AllItems-BlackBruise-50692"
  value: {
-  dps: 6362.34811
-  tps: 5285.2464
+  dps: 6353.14169
+  tps: 5277.44973
  }
 }
 dps_results: {
@@ -132,696 +132,696 @@ dps_results: {
 dps_results: {
  key: "TestArms-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 6637.10811
-  tps: 5453.99988
+  dps: 6637.10812
+  tps: 5453.99989
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 6392.34217
-  tps: 5262.95475
+  dps: 6384.35457
+  tps: 5255.79671
  }
 }
 dps_results: {
  key: "TestArms-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6446.55801
+  dps: 8019.40377
+  tps: 6457.68367
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 8201.31258
-  tps: 6737.02126
+  dps: 8197.12109
+  tps: 6732.76293
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 8201.31258
-  tps: 6737.02126
+  dps: 8197.12109
+  tps: 6732.76293
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 8201.31258
-  tps: 6737.02126
+  dps: 8197.12109
+  tps: 6732.76293
  }
 }
 dps_results: {
  key: "TestArms-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
   hps: 64
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7774.96593
-  tps: 6394.27937
+  dps: 7769.30862
+  tps: 6388.61958
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7806.40062
-  tps: 6419.35267
+  dps: 7802.78968
+  tps: 6415.18251
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Death'sChoice-47464"
  value: {
-  dps: 8233.08241
-  tps: 6766.62608
+  dps: 8223.14511
+  tps: 6759.32926
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7759.00814
-  tps: 6380.59453
+  dps: 7764.58885
+  tps: 6384.71223
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 8225.80899
-  tps: 6758.58324
+  dps: 8225.81557
+  tps: 6758.59099
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 8222.06994
-  tps: 6752.23836
+  dps: 8222.07056
+  tps: 6752.24135
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7712.53032
-  tps: 6344.87092
+  dps: 7706.26779
+  tps: 6338.52385
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 8024.77856
-  tps: 6595.01416
+  dps: 8037.68932
+  tps: 6604.65217
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 7913.11305
-  tps: 6501.34601
+  dps: 7916.60377
+  tps: 6506.06051
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 7903.5027
-  tps: 6490.14115
+  dps: 7896.39976
+  tps: 6483.18347
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DreadnaughtBattlegear"
  value: {
-  dps: 7485.94056
-  tps: 6158.7288
+  dps: 7504.4321
+  tps: 6174.77688
  }
 }
 dps_results: {
  key: "TestArms-AllItems-DreadnaughtPlate"
  value: {
-  dps: 6546.72754
-  tps: 5362.06721
+  dps: 6563.94005
+  tps: 5375.84168
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 8028.25824
-  tps: 6597.7899
+  dps: 8041.16872
+  tps: 6607.42769
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 8025.54376
-  tps: 6595.28223
+  dps: 8038.45424
+  tps: 6604.92002
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7786.67434
-  tps: 6396.43911
+  dps: 7791.98525
+  tps: 6401.77009
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7813.04663
-  tps: 6423.34246
+  dps: 7812.8946
+  tps: 6422.73469
  }
 }
 dps_results: {
  key: "TestArms-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7764.65557
-  tps: 6384.52003
+  dps: 7764.58254
+  tps: 6383.97546
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7743.66401
-  tps: 6367.51515
+  dps: 7751.67953
+  tps: 6373.89882
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 7902.01971
-  tps: 6490.18961
+  dps: 7911.66088
+  tps: 6499.17368
  }
 }
 dps_results: {
  key: "TestArms-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Gladiator'sBattlegear"
  value: {
-  dps: 7809.67131
-  tps: 6386.10798
+  dps: 7814.96662
+  tps: 6389.51073
  }
 }
 dps_results: {
  key: "TestArms-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 7790.49938
-  tps: 6406.70123
+  dps: 7790.66296
+  tps: 6406.36445
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Heartpierce-49982"
  value: {
-  dps: 8201.31258
-  tps: 6737.02126
+  dps: 8197.12109
+  tps: 6732.76293
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Heartpierce-50641"
  value: {
-  dps: 8201.31258
-  tps: 6737.02126
+  dps: 8197.12109
+  tps: 6732.76293
  }
 }
 dps_results: {
  key: "TestArms-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 8028.25824
-  tps: 6597.7899
+  dps: 8041.16872
+  tps: 6607.42769
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 8025.54376
-  tps: 6595.28223
+  dps: 8038.45424
+  tps: 6604.92002
  }
 }
 dps_results: {
  key: "TestArms-AllItems-IncisorFragment-37723"
  value: {
-  dps: 7874.47206
-  tps: 6471.52253
+  dps: 7871.96164
+  tps: 6467.72022
  }
 }
 dps_results: {
  key: "TestArms-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 8039.23319
-  tps: 6607.38437
+  dps: 8036.29769
+  tps: 6604.32177
   hps: 14.6381
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 7908.27742
-  tps: 6499.7868
+  dps: 7910.72702
+  tps: 6501.21421
  }
 }
 dps_results: {
  key: "TestArms-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7803.14115
-  tps: 6420.50042
+  dps: 7801.66995
+  tps: 6419.17166
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7706.11672
-  tps: 6338.63811
+  dps: 7708.86644
+  tps: 6340.87512
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OnslaughtArmor"
  value: {
-  dps: 5353.12992
-  tps: 4399.002
+  dps: 5352.16787
+  tps: 4397.64389
  }
 }
 dps_results: {
  key: "TestArms-AllItems-OnslaughtBattlegear"
  value: {
-  dps: 6273.65123
-  tps: 5157.32243
+  dps: 6273.65124
+  tps: 5157.32223
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 8051.51851
-  tps: 6616.29779
+  dps: 8043.34762
+  tps: 6609.64374
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 8054.6351
-  tps: 6619.43519
+  dps: 8051.6223
+  tps: 6616.32561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 7761.45561
-  tps: 6380.87424
+  dps: 7758.60829
+  tps: 6377.98872
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7764.23995
-  tps: 6382.41303
+  dps: 7761.39198
+  tps: 6379.5266
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 8196.29113
-  tps: 6731.90292
+  dps: 8192.09976
+  tps: 6727.64468
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7676.48338
-  tps: 6308.4639
+  dps: 7679.24713
+  tps: 6310.71096
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Shadowmourne-49623"
  value: {
-  dps: 8201.31258
-  tps: 6737.02126
+  dps: 8197.12109
+  tps: 6732.76293
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SiegebreakerBattlegear"
  value: {
-  dps: 7782.77651
-  tps: 6399.6512
+  dps: 7782.77652
+  tps: 6399.65245
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SiegebreakerPlate"
  value: {
-  dps: 6789.44678
-  tps: 5561.21833
+  dps: 6775.51485
+  tps: 5552.32096
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SoulPreserver-37111"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SouloftheDead-40382"
  value: {
-  dps: 7767.20464
-  tps: 6386.66363
+  dps: 7767.13161
+  tps: 6386.11905
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SparkofLife-37657"
  value: {
-  dps: 7803.93811
-  tps: 6410.81213
+  dps: 7797.92719
+  tps: 6405.22091
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 7984.33853
-  tps: 6558.40198
+  dps: 7990.04612
+  tps: 6564.2854
  }
 }
 dps_results: {
  key: "TestArms-AllItems-StormshroudArmor"
  value: {
-  dps: 6324.08514
-  tps: 5193.4975
+  dps: 6324.05397
+  tps: 5193.47291
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 8054.6351
-  tps: 6619.43519
+  dps: 8051.6223
+  tps: 6616.32561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 8051.51851
-  tps: 6616.29779
+  dps: 8043.34762
+  tps: 6609.64374
  }
 }
 dps_results: {
  key: "TestArms-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 8034.06003
-  tps: 6601.71536
+  dps: 8024.43799
+  tps: 6593.8397
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheFistsofFury"
  value: {
-  dps: 4715.74964
-  tps: 3969.59499
+  dps: 4721.67207
+  tps: 3974.71872
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5022.02007
-  tps: 4222.00562
+  dps: 5021.34058
+  tps: 4220.77683
  }
 }
 dps_results: {
  key: "TestArms-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 8027.04116
-  tps: 6594.55261
+  dps: 8023.22466
+  tps: 6592.22802
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 8156.36973
-  tps: 6696.98659
+  dps: 8156.37828
+  tps: 6697.00139
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 8180.20678
-  tps: 6715.87548
+  dps: 8171.60131
+  tps: 6708.40541
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7713.15952
-  tps: 6339.25381
+  dps: 7713.56104
+  tps: 6338.31356
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 8004.96444
-  tps: 6578.04315
+  dps: 8019.40377
+  tps: 6589.39561
  }
 }
 dps_results: {
  key: "TestArms-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6611.70928
-  tps: 5434.97233
+  dps: 6611.70851
+  tps: 5434.97432
  }
 }
 dps_results: {
@@ -834,57 +834,57 @@ dps_results: {
 dps_results: {
  key: "TestArms-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7671.00574
-  tps: 6306.68744
+  dps: 7673.78352
+  tps: 6308.94686
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Wrynn'sBattlegear"
  value: {
-  dps: 8049.60229
-  tps: 6597.61485
+  dps: 8047.891
+  tps: 6596.55688
  }
 }
 dps_results: {
  key: "TestArms-AllItems-Wrynn'sPlate"
  value: {
-  dps: 6773.37311
-  tps: 5550.00625
+  dps: 6784.83727
+  tps: 5559.31279
  }
 }
 dps_results: {
  key: "TestArms-AllItems-YmirjarLord'sBattlegear"
  value: {
-  dps: 8471.16664
-  tps: 6977.1737
+  dps: 8452.05744
+  tps: 6961.6838
  }
 }
 dps_results: {
  key: "TestArms-AllItems-YmirjarLord'sPlate"
  value: {
-  dps: 6957.99745
-  tps: 5707.98049
+  dps: 6964.26926
+  tps: 5712.19977
  }
 }
 dps_results: {
  key: "TestArms-Average-Default"
  value: {
-  dps: 8196.52096
-  tps: 6736.81287
+  dps: 8196.92845
+  tps: 6737.12291
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 10942.10565
-  tps: 9329.94442
+  dps: 10921.653
+  tps: 9313.8432
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 8182.14683
-  tps: 6722.23279
+  dps: 8162.06263
+  tps: 6703.66561
  }
 }
 dps_results: {
@@ -897,15 +897,15 @@ dps_results: {
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 6423.24032
-  tps: 5547.23579
+  dps: 6434.45782
+  tps: 5556.05417
  }
 }
 dps_results: {
  key: "TestArms-Settings-Human-Arms P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4592.62272
-  tps: 3770.98179
+  dps: 4581.86241
+  tps: 3762.83021
  }
 }
 dps_results: {
@@ -918,15 +918,15 @@ dps_results: {
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 11007.72595
-  tps: 9390.30513
+  dps: 11013.87294
+  tps: 9395.03175
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 8201.31258
-  tps: 6737.02126
+  dps: 8197.12109
+  tps: 6732.76293
  }
 }
 dps_results: {
@@ -939,15 +939,15 @@ dps_results: {
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 6441.53765
-  tps: 5561.80385
+  dps: 6462.58623
+  tps: 5579.76477
  }
 }
 dps_results: {
  key: "TestArms-Settings-Orc-Arms P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4585.71188
-  tps: 3766.41458
+  dps: 4581.03965
+  tps: 3763.97857
  }
 }
 dps_results: {
@@ -960,7 +960,7 @@ dps_results: {
 dps_results: {
  key: "TestArms-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7660.81743
-  tps: 6291.26678
+  dps: 7640.21026
+  tps: 6273.66288
  }
 }
diff --git a/sim/warrior/dps/TestFury.results b/sim/warrior/dps/TestFury.results
index c74e656b4a..b4d4cc2865 100644
--- a/sim/warrior/dps/TestFury.results
+++ b/sim/warrior/dps/TestFury.results
@@ -46,921 +46,921 @@ character_stats_results: {
 dps_results: {
  key: "TestFury-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-AshtongueTalismanofValor-32485"
  value: {
-  dps: 6558.97463
-  tps: 4846.8287
+  dps: 6544.46017
+  tps: 4836.22692
  }
 }
 dps_results: {
  key: "TestFury-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 6773.29231
-  tps: 5008.93785
+  dps: 6779.83774
+  tps: 5014.28186
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 6709.31005
-  tps: 4954.71897
+  dps: 6716.79315
+  tps: 4960.99744
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
   hps: 90.47701
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
   hps: 90.47701
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 6802.39371
-  tps: 5028.26178
+  dps: 6801.15049
+  tps: 5027.52849
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 6576.13367
-  tps: 4865.03268
+  dps: 6596.30455
+  tps: 4878.9334
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlackBruise-50035"
  value: {
-  dps: 5808.70512
-  tps: 4305.99892
+  dps: 5828.48559
+  tps: 4322.30597
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlackBruise-50692"
  value: {
-  dps: 5964.20288
-  tps: 4420.75677
+  dps: 5967.46629
+  tps: 4422.7669
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 5359.47155
-  tps: 3968.63789
+  dps: 5371.99514
+  tps: 3977.87967
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 5357.424
-  tps: 3967.61582
+  dps: 5358.9324
+  tps: 3969.34119
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5009.65149
-  tps: 3712.63382
+  dps: 5003.04302
+  tps: 3708.7015
  }
 }
 dps_results: {
  key: "TestFury-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 6769.87763
-  tps: 4906.11701
+  dps: 6776.42141
+  tps: 4911.37952
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 6895.27572
-  tps: 5096.73147
+  dps: 6899.72323
+  tps: 5100.12123
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 6895.27572
-  tps: 5096.73147
+  dps: 6899.72323
+  tps: 5100.12123
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 6895.27572
-  tps: 5096.73147
+  dps: 6899.72323
+  tps: 5100.12123
  }
 }
 dps_results: {
  key: "TestFury-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
   hps: 64
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 6663.57103
-  tps: 4923.95278
+  dps: 6665.52011
+  tps: 4925.79305
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 6701.68855
-  tps: 4948.65355
+  dps: 6707.91212
+  tps: 4953.88949
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Death'sChoice-47464"
  value: {
-  dps: 7029.01622
-  tps: 5190.53175
+  dps: 7025.41751
+  tps: 5187.65271
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 6636.56348
-  tps: 4901.86728
+  dps: 6639.49585
+  tps: 4905.08178
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 7046.83464
-  tps: 5204.29507
+  dps: 7046.89443
+  tps: 5204.55688
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 7083.23016
-  tps: 5232.51298
+  dps: 7080.45581
+  tps: 5230.52912
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Defender'sCode-40257"
  value: {
-  dps: 6539.54098
-  tps: 4832.75859
+  dps: 6525.46353
+  tps: 4821.94868
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 6819.22755
-  tps: 5040.05999
+  dps: 6817.98433
+  tps: 5039.3765
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 6716.20722
-  tps: 4967.99119
+  dps: 6706.30749
+  tps: 4961.43645
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 6687.85958
-  tps: 4944.7685
+  dps: 6690.18227
+  tps: 4945.70333
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DreadnaughtBattlegear"
  value: {
-  dps: 6125.89677
-  tps: 4538.29454
+  dps: 6125.89858
+  tps: 4538.02939
  }
 }
 dps_results: {
  key: "TestFury-AllItems-DreadnaughtPlate"
  value: {
-  dps: 5271.5789
-  tps: 3901.47393
+  dps: 5275.35473
+  tps: 3904.88693
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 6802.39371
-  tps: 5028.26178
+  dps: 6801.15049
+  tps: 5027.52849
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 6780.03094
-  tps: 5012.09632
+  dps: 6791.25373
+  tps: 5020.71389
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 6658.71725
-  tps: 4921.07778
+  dps: 6645.94452
+  tps: 4911.41211
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 6687.30275
-  tps: 4939.69563
+  dps: 6689.25183
+  tps: 4941.5753
  }
 }
 dps_results: {
  key: "TestFury-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6647.06581
-  tps: 4911.56125
+  dps: 6653.28938
+  tps: 4916.84957
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6621.56777
-  tps: 4890.85331
+  dps: 6619.57187
+  tps: 4889.84906
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-FuryoftheFiveFlights-40431"
  value: {
   dps: 6737.5801
-  tps: 4977.63189
+  tps: 4977.85853
  }
 }
 dps_results: {
  key: "TestFury-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Gladiator'sBattlegear"
  value: {
-  dps: 6462.60822
-  tps: 4771.61854
+  dps: 6468.28096
+  tps: 4775.46945
  }
 }
 dps_results: {
  key: "TestFury-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 6672.0036
-  tps: 4927.22329
+  dps: 6678.22717
+  tps: 4932.39861
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Heartpierce-49982"
  value: {
-  dps: 6895.27572
-  tps: 5096.73147
+  dps: 6899.72323
+  tps: 5100.12123
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Heartpierce-50641"
  value: {
-  dps: 6895.27572
-  tps: 5096.73147
+  dps: 6899.72323
+  tps: 5100.12123
  }
 }
 dps_results: {
  key: "TestFury-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 6802.39371
-  tps: 5028.26178
+  dps: 6801.15049
+  tps: 5027.52849
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 6780.03094
-  tps: 5012.09632
+  dps: 6791.25373
+  tps: 5020.71389
  }
 }
 dps_results: {
  key: "TestFury-AllItems-IncisorFragment-37723"
  value: {
-  dps: 6726.64285
-  tps: 4970.0836
+  dps: 6735.35609
+  tps: 4977.83804
  }
 }
 dps_results: {
  key: "TestFury-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 6786.59241
-  tps: 5015.19862
+  dps: 6786.2894
+  tps: 5015.10713
   hps: 14.6381
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-MeteoriteWhetstone-37390"
  value: {
   dps: 6746.83866
-  tps: 4986.50187
+  tps: 4986.75381
  }
 }
 dps_results: {
  key: "TestFury-AllItems-NevermeltingIceCrystal-50259"
  value: {
   dps: 6706.50854
-  tps: 4952.94061
+  tps: 4953.0623
  }
 }
 dps_results: {
  key: "TestFury-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 6523.23691
-  tps: 4820.39468
+  dps: 6519.02042
+  tps: 4817.57131
  }
 }
 dps_results: {
  key: "TestFury-AllItems-OnslaughtArmor"
  value: {
-  dps: 4129.94949
-  tps: 3063.44517
+  dps: 4129.92792
+  tps: 3063.72015
  }
 }
 dps_results: {
  key: "TestFury-AllItems-OnslaughtBattlegear"
  value: {
-  dps: 4945.86452
-  tps: 3667.78539
+  dps: 4946.20544
+  tps: 3668.22713
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 6788.20289
-  tps: 5016.61655
+  dps: 6785.84866
+  tps: 5014.88331
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 6786.47663
-  tps: 5014.35378
+  dps: 6784.11898
+  tps: 5012.55136
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 6562.82147
-  tps: 4851.01334
+  dps: 6553.85779
+  tps: 4843.68624
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 6571.29642
-  tps: 4857.17426
+  dps: 6567.98564
+  tps: 4854.02185
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 6887.82767
-  tps: 5091.94968
+  dps: 6892.84468
+  tps: 5095.15626
  }
 }
 dps_results: {
  key: "TestFury-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 6542.35214
-  tps: 4835.442
+  dps: 6537.42158
+  tps: 4833.04522
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Shadowmourne-49623"
  value: {
-  dps: 6895.27572
-  tps: 5096.73147
+  dps: 6899.72323
+  tps: 5100.12123
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SiegebreakerBattlegear"
  value: {
-  dps: 6451.58344
-  tps: 4770.11067
+  dps: 6452.06859
+  tps: 4770.73123
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SiegebreakerPlate"
  value: {
   dps: 5531.65439
-  tps: 4093.694
+  tps: 4093.9969
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SoulPreserver-37111"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SouloftheDead-40382"
  value: {
-  dps: 6642.31605
-  tps: 4907.9048
+  dps: 6644.26513
+  tps: 4909.78448
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SparkofLife-37657"
  value: {
-  dps: 6617.51982
-  tps: 4892.69607
+  dps: 6622.16288
+  tps: 4895.917
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 6725.23265
-  tps: 4974.44617
+  dps: 6721.49076
+  tps: 4971.74908
  }
 }
 dps_results: {
  key: "TestFury-AllItems-StormshroudArmor"
  value: {
-  dps: 5025.6354
-  tps: 3727.44949
+  dps: 5023.12774
+  tps: 3725.64574
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 6786.47663
-  tps: 5014.35378
+  dps: 6784.11898
+  tps: 5012.55136
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 6788.20289
-  tps: 5016.61655
+  dps: 6785.84866
+  tps: 5014.88331
  }
 }
 dps_results: {
  key: "TestFury-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 6781.00781
-  tps: 5011.4902
+  dps: 6783.33999
+  tps: 5013.08777
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TheFistsofFury"
  value: {
-  dps: 4948.47106
-  tps: 3664.87246
+  dps: 4952.00346
+  tps: 3668.37661
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5332.01502
-  tps: 3943.54625
+  dps: 5335.24557
+  tps: 3946.16303
  }
 }
 dps_results: {
  key: "TestFury-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6782.24068
-  tps: 5015.94205
+  dps: 6787.30562
+  tps: 5019.05253
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 6923.07873
-  tps: 5108.85873
+  dps: 6924.11544
+  tps: 5109.85556
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 6958.25575
-  tps: 5134.84812
+  dps: 6966.78231
+  tps: 5141.95472
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 6582.85775
-  tps: 4862.68369
+  dps: 6570.26004
+  tps: 4852.82696
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 6769.87763
-  tps: 5005.93904
+  dps: 6776.42141
+  tps: 5011.30841
  }
 }
 dps_results: {
  key: "TestFury-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
   dps: 5316.96186
-  tps: 3936.6848
+  tps: 3936.97813
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 5080.0491
-  tps: 3807.536
+  dps: 5088.54297
+  tps: 3813.3539
  }
 }
 dps_results: {
  key: "TestFury-AllItems-WingedTalisman-37844"
  value: {
-  dps: 6511.61676
-  tps: 4812.22724
+  dps: 6507.78815
+  tps: 4810.46726
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Wrynn'sBattlegear"
  value: {
-  dps: 6525.52983
-  tps: 4822.00878
+  dps: 6544.23066
+  tps: 4835.93036
  }
 }
 dps_results: {
  key: "TestFury-AllItems-Wrynn'sPlate"
  value: {
-  dps: 5508.2804
-  tps: 4077.08232
+  dps: 5515.70068
+  tps: 4083.0106
  }
 }
 dps_results: {
  key: "TestFury-AllItems-YmirjarLord'sBattlegear"
  value: {
-  dps: 7200.13496
-  tps: 5329.24028
+  dps: 7204.69929
+  tps: 5331.65244
  }
 }
 dps_results: {
  key: "TestFury-AllItems-YmirjarLord'sPlate"
  value: {
-  dps: 5683.19354
-  tps: 4205.1735
+  dps: 5699.48384
+  tps: 4216.87537
  }
 }
 dps_results: {
  key: "TestFury-Average-Default"
  value: {
-  dps: 6931.98156
-  tps: 5122.1714
+  dps: 6934.14907
+  tps: 5124.00069
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 9307.16342
-  tps: 7403.93878
+  dps: 9307.52813
+  tps: 7404.42019
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6865.87846
-  tps: 5074.29986
+  dps: 6858.89258
+  tps: 5069.87518
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
   dps: 7538.88437
-  tps: 5580.54054
+  tps: 5580.6798
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 4616.31645
-  tps: 3734.82953
+  dps: 4627.4223
+  tps: 3742.95662
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3118.55985
-  tps: 2319.74051
+  dps: 3120.5443
+  tps: 2321.78606
  }
 }
 dps_results: {
  key: "TestFury-Settings-Human-Fury P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3111.71205
-  tps: 2320.59683
+  dps: 3102.03459
+  tps: 2314.40821
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 9326.566
-  tps: 7415.14975
+  dps: 9332.26502
+  tps: 7420.02205
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6895.27572
-  tps: 5096.73147
+  dps: 6899.72323
+  tps: 5100.12123
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
   dps: 7695.32132
-  tps: 5693.82622
+  tps: 5694.22731
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 4685.70243
-  tps: 3791.25818
+  dps: 4676.22839
+  tps: 3784.5663
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3137.34525
-  tps: 2333.82762
+  dps: 3125.79736
+  tps: 2325.10073
  }
 }
 dps_results: {
  key: "TestFury-Settings-Orc-Fury P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3122.89636
-  tps: 2329.84147
+  dps: 3111.96525
+  tps: 2322.33269
  }
 }
 dps_results: {
  key: "TestFury-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6383.65915
-  tps: 4722.0798
+  dps: 6387.22203
+  tps: 4722.80386
  }
 }
diff --git a/sim/warrior/dps/rotation.go b/sim/warrior/dps/rotation.go
index 6d4fb5b819..6204564074 100644
--- a/sim/warrior/dps/rotation.go
+++ b/sim/warrior/dps/rotation.go
@@ -16,9 +16,15 @@ func (war *DpsWarrior) OnGCDReady(sim *core.Simulation) {
 
 	// Pause rotation on every rend tick to check if TFB procs
 	if rendRemainingDur != war.Rend.CurDot().Duration && rendRemainingDur%3 == 0 && war.Talents.TasteForBlood > 0 {
-		war.WaitUntil(sim, sim.CurrentTime+time.Microsecond*1)
+		core.StartDelayedAction(sim, core.DelayedActionOptions{
+			DoAt: sim.CurrentTime + time.Microsecond*1,
+			OnAction: func(_ *core.Simulation) {
+				war.doRotation(sim)
+			},
+		})
+	} else {
+		war.doRotation(sim)
 	}
-	war.doRotation(sim)
 
 	if war.GCD.IsReady(sim) && !war.IsWaiting() {
 		// This means we did nothing