diff --git a/sim/rogue/TestAssassination.results b/sim/rogue/TestAssassination.results
index d19c82652b..fcad42c8c6 100644
--- a/sim/rogue/TestAssassination.results
+++ b/sim/rogue/TestAssassination.results
@@ -1,27 +1,27 @@
 character_stats_results: {
  key: "TestAssassination-CharacterStats-Default"
  value: {
-  final_stats: 396
-  final_stats: 1519.1
-  final_stats: 1426.15
-  final_stats: 182.6
-  final_stats: 232.265
+  final_stats: 393.8
+  final_stats: 1502.6
+  final_stats: 1445.95
+  final_stats: 187
+  final_stats: 244.728
   final_stats: 280
   final_stats: 109
   final_stats: 437.16
   final_stats: 877.777
   final_stats: 221
   final_stats: 0
-  final_stats: 5657.41
+  final_stats: 5636.84
   final_stats: 469.95
-  final_stats: 1946.07482
+  final_stats: 1936.96459
   final_stats: 221
   final_stats: 94
   final_stats: 215
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 9412.7
+  final_stats: 9379.7
   final_stats: 3396.8
   final_stats: 0
   final_stats: 0
@@ -29,7 +29,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 17785.5
+  final_stats: 17983.5
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -45,673 +45,673 @@ character_stats_results: {
 dps_results: {
  key: "TestAssassination-AllItems-AshtongueTalismanofLethality-32492"
  value: {
-  dps: 7167.5417
-  tps: 5088.95461
+  dps: 7137.77093
+  tps: 5067.81736
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 7236.85888
-  tps: 5138.16981
+  dps: 7202.88841
+  tps: 5114.05077
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 7201.50684
-  tps: 5113.06985
+  dps: 7179.82253
+  tps: 5097.67399
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5443.09783
-  tps: 3864.59946
+  dps: 5421.92146
+  tps: 3849.56424
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-BonescytheBattlegear"
  value: {
-  dps: 6540.60967
-  tps: 4643.83287
+  dps: 6509.43604
+  tps: 4621.69959
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 7171.4895
-  tps: 4989.92239
+  dps: 7157.4952
+  tps: 4980.18516
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 7316.2609
-  tps: 5194.54524
+  dps: 7293.93185
+  tps: 5178.69161
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7143.13023
-  tps: 5071.62246
+  dps: 7120.07019
+  tps: 5055.24983
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7188.99125
-  tps: 5104.18379
+  dps: 7165.09185
+  tps: 5087.21522
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-DarkmoonCard:Greatness-42987"
  value: {
-  dps: 7294.24449
-  tps: 5178.91359
+  dps: 7256.83214
+  tps: 5152.35082
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-DarkmoonCard:Greatness-44254"
  value: {
-  dps: 7207.73474
-  tps: 5117.49167
+  dps: 7170.44748
+  tps: 5091.01771
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7132.77571
-  tps: 5064.27075
+  dps: 7106.24144
+  tps: 5045.43142
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7008.82506
-  tps: 4976.26579
+  dps: 6978.96688
+  tps: 4955.06649
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 7207.64546
-  tps: 5117.42828
+  dps: 7185.97188
+  tps: 5102.04003
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 7201.50684
-  tps: 5113.06985
+  dps: 7179.82253
+  tps: 5097.67399
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 7198.47896
-  tps: 5110.92006
+  dps: 7172.32021
+  tps: 5092.34735
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7165.10572
-  tps: 5087.22506
+  dps: 7138.84031
+  tps: 5068.57662
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7128.85931
-  tps: 5061.49011
+  dps: 7104.98463
+  tps: 5044.53909
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7110.00666
-  tps: 5048.10473
+  dps: 7080.438
+  tps: 5027.11098
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 7282.90906
-  tps: 5170.86543
+  dps: 7252.64557
+  tps: 5149.37835
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7008.82506
-  tps: 4976.26579
+  dps: 6978.96688
+  tps: 4955.06649
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-Gladiator'sVestments"
  value: {
-  dps: 7049.33544
-  tps: 5005.02817
+  dps: 7018.11046
+  tps: 4982.85843
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7008.82506
-  tps: 4976.26579
+  dps: 6978.96688
+  tps: 4955.06649
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 7201.50684
-  tps: 5113.06985
+  dps: 7179.82253
+  tps: 5097.67399
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 7198.47896
-  tps: 5110.92006
+  dps: 7172.32021
+  tps: 5092.34735
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-IncisorFragment-37723"
  value: {
-  dps: 7186.6108
-  tps: 5102.49367
+  dps: 7156.76021
+  tps: 5081.29975
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 7207.78206
-  tps: 5117.52526
+  dps: 7193.77416
+  tps: 5107.57966
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7008.82506
-  tps: 4976.26579
+  dps: 6978.96688
+  tps: 4955.06649
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7008.82506
-  tps: 4976.26579
+  dps: 6978.96688
+  tps: 4955.06649
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 7245.04387
-  tps: 5143.98115
+  dps: 7212.19311
+  tps: 5120.65711
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7008.82506
-  tps: 4976.26579
+  dps: 6978.96688
+  tps: 4955.06649
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 7200.86919
-  tps: 5112.61713
+  dps: 7186.86388
+  tps: 5102.67336
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 7207.78206
-  tps: 5117.52526
+  dps: 7193.77416
+  tps: 5107.57966
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7008.82506
-  tps: 4976.26579
+  dps: 6978.96688
+  tps: 4955.06649
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7207.48861
-  tps: 5117.31691
+  dps: 7178.98201
+  tps: 5097.07723
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7231.79411
-  tps: 5134.57382
+  dps: 7203.25365
+  tps: 5114.31009
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 7327.90929
-  tps: 5202.81559
+  dps: 7295.28038
+  tps: 5179.64907
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7008.82506
-  tps: 4976.26579
+  dps: 6978.96688
+  tps: 4955.06649
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7008.82506
-  tps: 4976.26579
+  dps: 6978.96688
+  tps: 4955.06649
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-Shadowblade'sBattlegear"
  value: {
-  dps: 7494.25516
-  tps: 5320.92116
+  dps: 7467.23518
+  tps: 5301.73698
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7008.82506
-  tps: 4976.26579
+  dps: 6978.96688
+  tps: 4955.06649
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7008.82506
-  tps: 4976.26579
+  dps: 6978.96688
+  tps: 4955.06649
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-Slayer'sArmor"
  value: {
-  dps: 5365.13568
-  tps: 3809.24634
+  dps: 5332.07121
+  tps: 3785.77056
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-SparkofLife-37657"
  value: {
-  dps: 7087.31547
-  tps: 5031.99398
+  dps: 7065.27381
+  tps: 5016.3444
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 7203.82014
-  tps: 5114.7123
+  dps: 7179.05461
+  tps: 5097.12877
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-StormshroudArmor"
  value: {
-  dps: 5682.90015
-  tps: 4034.85911
+  dps: 5657.53583
+  tps: 4016.85044
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 7207.78206
-  tps: 5117.52526
+  dps: 7193.77416
+  tps: 5107.57966
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 7200.86919
-  tps: 5112.61713
+  dps: 7186.86388
+  tps: 5102.67336
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 7188.77167
-  tps: 5104.02789
+  dps: 7174.7709
+  tps: 5094.08734
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-TerrorbladeBattlegear"
  value: {
-  dps: 6785.65783
-  tps: 4817.81706
+  dps: 6757.64255
+  tps: 4797.92621
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-TheFistsofFury"
  value: {
-  dps: 4958.87683
-  tps: 3520.80255
+  dps: 4939.36912
+  tps: 3506.95208
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 7252.6507
-  tps: 5149.382
+  dps: 7230.16149
+  tps: 5133.41466
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 7345.06133
-  tps: 5214.99354
+  dps: 7309.76199
+  tps: 5189.93101
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 7390.20551
-  tps: 5247.04591
+  dps: 7354.64838
+  tps: 5221.80035
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 7171.4895
-  tps: 5091.75754
+  dps: 7157.4952
+  tps: 5081.82159
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 5785.31725
-  tps: 4107.57524
+  dps: 5775.68916
+  tps: 4100.73931
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-VanCleef'sBattlegear"
  value: {
-  dps: 6717.74068
-  tps: 4769.59589
+  dps: 6696.25075
+  tps: 4754.33803
  }
 }
 dps_results: {
  key: "TestAssassination-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7008.82506
-  tps: 4976.26579
+  dps: 6978.96688
+  tps: 4955.06649
  }
 }
 dps_results: {
  key: "TestAssassination-Average-Default"
  value: {
-  dps: 7331.48773
-  tps: 5205.35629
+  dps: 7304.02371
+  tps: 5185.85683
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-FullBuffs-LongMultiTarget"
  value: {
-  dps: 25817.76852
-  tps: 18330.61565
+  dps: 25764.84282
+  tps: 18293.0384
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7327.90929
-  tps: 5202.81559
+  dps: 7295.28038
+  tps: 5179.64907
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8332.92308
-  tps: 5916.37539
+  dps: 8299.23448
+  tps: 5892.45648
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-NoBuffs-LongMultiTarget"
  value: {
-  dps: 15189.2114
-  tps: 10784.3401
+  dps: 15102.86158
+  tps: 10723.03172
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3586.49533
-  tps: 2546.41169
+  dps: 3569.46067
+  tps: 2534.31708
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-Assassination-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3624.53288
-  tps: 2573.41835
+  dps: 3616.02634
+  tps: 2567.3787
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-FullBuffs-LongMultiTarget"
  value: {
-  dps: 15753.88222
-  tps: 11185.25638
+  dps: 15657.11592
+  tps: 11116.5523
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-FullBuffs-LongSingleTarget"
  value: {
-  dps: 5732.552
-  tps: 4070.11192
+  dps: 5715.62331
+  tps: 4058.09255
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 6689.86597
-  tps: 4749.80484
+  dps: 6657.14776
+  tps: 4726.57491
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-NoBuffs-LongMultiTarget"
  value: {
-  dps: 8987.98618
-  tps: 6381.47019
+  dps: 8934.2213
+  tps: 6343.29713
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-NoBuffs-LongSingleTarget"
  value: {
-  dps: 2601.39312
-  tps: 1846.98912
+  dps: 2585.83203
+  tps: 1835.94074
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Deadly OH Deadly-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 2654.25681
-  tps: 1884.52233
+  dps: 2637.77316
+  tps: 1872.81895
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-FullBuffs-LongMultiTarget"
  value: {
-  dps: 25817.76852
-  tps: 18330.61565
+  dps: 25764.84282
+  tps: 18293.0384
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7327.90929
-  tps: 5202.81559
+  dps: 7295.28038
+  tps: 5179.64907
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8332.92308
-  tps: 5916.37539
+  dps: 8299.23448
+  tps: 5892.45648
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-NoBuffs-LongMultiTarget"
  value: {
-  dps: 15189.2114
-  tps: 10784.3401
+  dps: 15102.86158
+  tps: 10723.03172
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3586.49533
-  tps: 2546.41169
+  dps: 3569.46067
+  tps: 2534.31708
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Deadly-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3624.53288
-  tps: 2573.41835
+  dps: 3616.02634
+  tps: 2567.3787
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-FullBuffs-LongMultiTarget"
  value: {
-  dps: 20020.4975
-  tps: 14214.55323
+  dps: 19956.55895
+  tps: 14169.15686
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-FullBuffs-LongSingleTarget"
  value: {
-  dps: 4798.97341
-  tps: 3407.27112
+  dps: 4772.22873
+  tps: 3388.28239
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 5450.11559
-  tps: 3869.58207
+  dps: 5427.49574
+  tps: 3853.52197
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-NoBuffs-LongMultiTarget"
  value: {
-  dps: 12960.63916
-  tps: 9202.0538
+  dps: 12927.38305
+  tps: 9178.44197
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-NoBuffs-LongSingleTarget"
  value: {
-  dps: 2387.62738
-  tps: 1695.21544
+  dps: 2376.44822
+  tps: 1687.27824
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-P1 Assassination-MH Instant OH Instant-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 2487.33455
-  tps: 1766.00753
+  dps: 2479.78591
+  tps: 1760.648
  }
 }
 dps_results: {
@@ -885,7 +885,7 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6867.79315
-  tps: 4876.13314
+  dps: 6851.71111
+  tps: 4864.71489
  }
 }
diff --git a/sim/rogue/TestCombat.results b/sim/rogue/TestCombat.results
index bcb74c3a85..3fcf401919 100644
--- a/sim/rogue/TestCombat.results
+++ b/sim/rogue/TestCombat.results
@@ -1,27 +1,27 @@
 character_stats_results: {
  key: "TestCombat-CharacterStats-Default"
  value: {
-  final_stats: 396
-  final_stats: 1519.1
-  final_stats: 1426.15
-  final_stats: 182.6
-  final_stats: 232.265
+  final_stats: 393.8
+  final_stats: 1502.6
+  final_stats: 1445.95
+  final_stats: 187
+  final_stats: 244.728
   final_stats: 280
   final_stats: 109
   final_stats: 437.16
   final_stats: 877.777
   final_stats: 221
   final_stats: 0
-  final_stats: 5883.7064
+  final_stats: 5862.3136
   final_stats: 469.95
-  final_stats: 1946.07482
+  final_stats: 1936.96459
   final_stats: 221
   final_stats: 94
   final_stats: 296.975
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 9412.7
+  final_stats: 9379.7
   final_stats: 3396.8
   final_stats: 0
   final_stats: 0
@@ -29,7 +29,7 @@ character_stats_results: {
   final_stats: 271.5
   final_stats: 0
   final_stats: 0
-  final_stats: 17785.5
+  final_stats: 17983.5
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -45,680 +45,680 @@ character_stats_results: {
 dps_results: {
  key: "TestCombat-AllItems-AshtongueTalismanofLethality-32492"
  value: {
-  dps: 6249.09742
-  tps: 4436.85917
+  dps: 6227.63426
+  tps: 4421.62032
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 6362.19141
-  tps: 4517.1559
+  dps: 6339.82069
+  tps: 4501.27269
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 6318.42927
-  tps: 4486.08478
+  dps: 6296.55948
+  tps: 4470.55723
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 4872.26367
-  tps: 3459.3072
+  dps: 4852.66274
+  tps: 3445.39054
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-BonescytheBattlegear"
  value: {
-  dps: 5844.14519
-  tps: 4149.34308
+  dps: 5824.51782
+  tps: 4135.40765
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4380.39119
+  dps: 6270.61077
+  tps: 4363.09098
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 6430.51635
-  tps: 4565.66661
+  dps: 6408.01085
+  tps: 4549.6877
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 6289.39186
-  tps: 4465.46822
+  dps: 6268.73122
+  tps: 4450.79917
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 6328.33588
-  tps: 4493.11848
+  dps: 6302.88956
+  tps: 4475.05159
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-DarkmoonCard:Greatness-42987"
  value: {
-  dps: 6379.28914
-  tps: 4529.29529
+  dps: 6356.37975
+  tps: 4513.02962
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-DarkmoonCard:Greatness-44254"
  value: {
-  dps: 6303.3329
-  tps: 4475.36636
+  dps: 6280.5246
+  tps: 4459.17247
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 6265.79729
-  tps: 4448.71608
+  dps: 6241.90086
+  tps: 4431.74961
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-Defender'sCode-40257"
  value: {
-  dps: 6163.05415
-  tps: 4375.76845
+  dps: 6140.84592
+  tps: 4360.0006
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 6324.14815
-  tps: 4490.14518
+  dps: 6299.97135
+  tps: 4472.97966
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 6318.42927
-  tps: 4486.08478
+  dps: 6296.55948
+  tps: 4470.55723
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 6312.69222
-  tps: 4482.01148
+  dps: 6291.45663
+  tps: 4466.93421
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 6327.30539
-  tps: 4492.38682
+  dps: 6305.39587
+  tps: 4476.83107
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6277.85585
-  tps: 4457.27765
+  dps: 6253.33195
+  tps: 4439.86568
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6251.03894
-  tps: 4438.23765
+  dps: 6227.41278
+  tps: 4421.46307
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 6404.27361
-  tps: 4547.03426
+  dps: 6381.7378
+  tps: 4531.03384
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6163.05415
-  tps: 4375.76845
+  dps: 6140.84592
+  tps: 4360.0006
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-Gladiator'sVestments"
  value: {
-  dps: 6243.16591
-  tps: 4432.6478
+  dps: 6221.94679
+  tps: 4417.58222
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6163.05415
-  tps: 4375.76845
+  dps: 6140.84592
+  tps: 4360.0006
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 6318.42927
-  tps: 4486.08478
+  dps: 6296.55948
+  tps: 4470.55723
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 6312.69222
-  tps: 4482.01148
+  dps: 6291.45663
+  tps: 4466.93421
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-IncisorFragment-37723"
  value: {
-  dps: 6347.67264
-  tps: 4506.84758
+  dps: 6325.07619
+  tps: 4490.8041
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 6327.36249
-  tps: 4492.42737
+  dps: 6302.4461
+  tps: 4474.73673
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 6163.05415
-  tps: 4375.76845
+  dps: 6140.84592
+  tps: 4360.0006
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6163.05415
-  tps: 4375.76845
+  dps: 6140.84592
+  tps: 4360.0006
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 6390.39925
-  tps: 4537.18346
+  dps: 6366.48907
+  tps: 4520.20724
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 6163.05415
-  tps: 4375.76845
+  dps: 6140.84592
+  tps: 4360.0006
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 6321.2886
-  tps: 4488.11491
+  dps: 6296.38222
+  tps: 4470.43138
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 6327.36249
-  tps: 4492.42737
+  dps: 6302.4461
+  tps: 4474.73673
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 6163.05415
-  tps: 4375.76845
+  dps: 6140.84592
+  tps: 4360.0006
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6307.23983
-  tps: 4478.14028
+  dps: 6285.07013
+  tps: 4462.39979
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6325.46963
-  tps: 4491.08344
+  dps: 6303.29994
+  tps: 4475.34295
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 6435.97172
-  tps: 4569.53992
+  dps: 6412.72082
+  tps: 4553.03178
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 6163.05415
-  tps: 4375.76845
+  dps: 6140.84592
+  tps: 4360.0006
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 6163.05415
-  tps: 4375.76845
+  dps: 6140.84592
+  tps: 4360.0006
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-Shadowblade'sBattlegear"
  value: {
-  dps: 6465.4623
-  tps: 4590.47824
+  dps: 6441.51116
+  tps: 4573.47293
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 6163.05415
-  tps: 4375.76845
+  dps: 6140.84592
+  tps: 4360.0006
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 6163.05415
-  tps: 4375.76845
+  dps: 6140.84592
+  tps: 4360.0006
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-Slayer'sArmor"
  value: {
-  dps: 4812.26327
-  tps: 3416.70692
+  dps: 4793.36974
+  tps: 3403.29251
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-SparkofLife-37657"
  value: {
-  dps: 6272.08356
-  tps: 4453.17933
+  dps: 6249.19228
+  tps: 4436.92652
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 6368.72414
-  tps: 4521.79414
+  dps: 6346.61487
+  tps: 4506.09656
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-StormshroudArmor"
  value: {
-  dps: 4939.04279
-  tps: 3506.72038
+  dps: 4919.95667
+  tps: 3493.16923
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 6327.36249
-  tps: 4492.42737
+  dps: 6302.4461
+  tps: 4474.73673
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 6321.2886
-  tps: 4488.11491
+  dps: 6296.38222
+  tps: 4470.43138
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 6310.65928
-  tps: 4480.56809
+  dps: 6285.77045
+  tps: 4462.89702
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-TerrorbladeBattlegear"
  value: {
-  dps: 6093.42943
-  tps: 4326.3349
+  dps: 6073.37336
+  tps: 4312.09508
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-TheFistsofFury"
  value: {
-  dps: 5630.26635
-  tps: 3997.48911
+  dps: 5608.74451
+  tps: 3982.2086
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5725.36584
-  tps: 4065.00975
+  dps: 5704.49967
+  tps: 4050.19477
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6376.64616
-  tps: 4527.41877
+  dps: 6351.11097
+  tps: 4509.28879
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 6452.03314
-  tps: 4580.94353
+  dps: 6428.12573
+  tps: 4563.96927
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 6482.63267
-  tps: 4602.66919
+  dps: 6457.67491
+  tps: 4584.94919
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 6295.47454
-  tps: 4469.78693
+  dps: 6270.61077
+  tps: 4452.13365
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 5175.0753
-  tps: 3674.30346
+  dps: 5155.48417
+  tps: 3660.39376
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-VanCleef'sBattlegear"
  value: {
-  dps: 5992.51367
-  tps: 4254.68471
+  dps: 5970.48552
+  tps: 4239.04472
  }
 }
 dps_results: {
  key: "TestCombat-AllItems-WingedTalisman-37844"
  value: {
-  dps: 6163.05415
-  tps: 4375.76845
+  dps: 6140.84592
+  tps: 4360.0006
  }
 }
 dps_results: {
  key: "TestCombat-Average-Default"
  value: {
-  dps: 6426.59115
-  tps: 4562.87972
+  dps: 6404.08711
+  tps: 4546.90185
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-FullBuffs-LongMultiTarget"
  value: {
-  dps: 14107.50908
-  tps: 10016.33145
+  dps: 14059.92222
+  tps: 9982.54478
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-FullBuffs-LongSingleTarget"
  value: {
-  dps: 5449.74047
-  tps: 3869.31573
+  dps: 5428.58811
+  tps: 3854.29756
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 6389.82968
-  tps: 4536.77907
+  dps: 6370.70242
+  tps: 4523.19872
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-NoBuffs-LongMultiTarget"
  value: {
-  dps: 8601.78527
-  tps: 6107.26754
+  dps: 8573.22493
+  tps: 6086.9897
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-NoBuffs-LongSingleTarget"
  value: {
-  dps: 2534.07815
-  tps: 1799.19549
+  dps: 2524.81854
+  tps: 1792.62117
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Deadly OH Deadly-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 2649.23655
-  tps: 1880.95795
+  dps: 2640.12767
+  tps: 1874.49065
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-FullBuffs-LongMultiTarget"
  value: {
-  dps: 19334.84022
-  tps: 13727.73656
+  dps: 19275.34147
+  tps: 13685.49245
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6435.97172
-  tps: 4569.53992
+  dps: 6412.72082
+  tps: 4553.03178
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7360.82913
-  tps: 5226.18868
+  dps: 7339.47046
+  tps: 5211.02403
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-NoBuffs-LongMultiTarget"
  value: {
-  dps: 12092.70099
-  tps: 8585.81771
+  dps: 12054.94665
+  tps: 8559.01212
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3173.97685
-  tps: 2253.52357
+  dps: 3162.64297
+  tps: 2245.47651
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Deadly OH Instant-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3234.6092
-  tps: 2296.57253
+  dps: 3223.9124
+  tps: 2288.9778
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-FullBuffs-LongMultiTarget"
  value: {
-  dps: 19334.84022
-  tps: 13727.73656
+  dps: 19275.34147
+  tps: 13685.49245
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6435.97172
-  tps: 4569.53992
+  dps: 6412.72082
+  tps: 4553.03178
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7360.82913
-  tps: 5226.18868
+  dps: 7339.47046
+  tps: 5211.02403
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-NoBuffs-LongMultiTarget"
  value: {
-  dps: 12092.70099
-  tps: 8585.81771
+  dps: 12054.94665
+  tps: 8559.01212
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3173.97685
-  tps: 2253.52357
+  dps: 3162.64297
+  tps: 2245.47651
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Instant OH Deadly-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3234.6092
-  tps: 2296.57253
+  dps: 3223.9124
+  tps: 2288.9778
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-FullBuffs-LongMultiTarget"
  value: {
-  dps: 18076.83793
-  tps: 12834.55493
+  dps: 18019.47033
+  tps: 12793.82394
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-FullBuffs-LongSingleTarget"
  value: {
-  dps: 4742.58552
-  tps: 3367.23572
+  dps: 4723.08847
+  tps: 3353.39282
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 5403.82361
-  tps: 3836.71476
+  dps: 5386.8298
+  tps: 3824.64916
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-NoBuffs-LongMultiTarget"
  value: {
-  dps: 11857.86826
-  tps: 8419.08646
+  dps: 11821.09776
+  tps: 8392.97941
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-NoBuffs-LongSingleTarget"
  value: {
-  dps: 2361.51414
-  tps: 1676.67504
+  dps: 2352.35036
+  tps: 1670.16876
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-P1-MH Instant OH Instant-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 2443.9411
-  tps: 1735.19818
+  dps: 2435.23679
+  tps: 1729.01812
  }
 }
 dps_results: {
@@ -892,7 +892,7 @@ dps_results: {
 dps_results: {
  key: "TestCombat-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6187.4681
-  tps: 4393.10235
+  dps: 6166.02359
+  tps: 4377.87675
  }
 }
diff --git a/sim/rogue/TestRotation.results b/sim/rogue/TestRotation.results
index 69c217956f..c163eaccee 100644
--- a/sim/rogue/TestRotation.results
+++ b/sim/rogue/TestRotation.results
@@ -43,15 +43,15 @@ casts_results: {
   }
   casts: {
    key: "spell_id:48664"
-   value: 63.2
+   value: 63.1
   }
   casts: {
    key: "spell_id:48665"
-   value: 63.2
+   value: 63.1
   }
   casts: {
    key: "spell_id:48666"
-   value: 63.2
+   value: 63.1
   }
   casts: {
    key: "spell_id:48668 tag:1"
@@ -123,11 +123,11 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57968"
-   value: 171.6
+   value: 171.5
   }
   casts: {
    key: "spell_id:57968 tag:1"
-   value: 308.4
+   value: 308.3
   }
   casts: {
    key: "spell_id:57968 tag:2"
@@ -135,7 +135,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57973"
-   value: 313.4
+   value: 313.3
   }
   casts: {
    key: "spell_id:57975"
@@ -163,11 +163,11 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57993 tag:4"
-   value: 15.6
+   value: 15.7
   }
   casts: {
    key: "spell_id:57993 tag:5"
-   value: 14.6
+   value: 14.5
   }
   casts: {
    key: "spell_id:58426"
@@ -207,7 +207,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:8647 tag:3"
-   value: 4.2
+   value: 4
   }
   casts: {
    key: "spell_id:8647 tag:4"
@@ -215,7 +215,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:8647 tag:5"
-   value: 3.8
+   value: 3.9
   }
  }
 }
@@ -264,15 +264,15 @@ casts_results: {
   }
   casts: {
    key: "spell_id:48664"
-   value: 60.3
+   value: 60.2
   }
   casts: {
    key: "spell_id:48665"
-   value: 60.3
+   value: 60.2
   }
   casts: {
    key: "spell_id:48666"
-   value: 60.3
+   value: 60.2
   }
   casts: {
    key: "spell_id:48668 tag:1"
@@ -344,7 +344,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57968"
-   value: 180.3
+   value: 179.8
   }
   casts: {
    key: "spell_id:57968 tag:1"
@@ -388,7 +388,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57993 tag:5"
-   value: 19.1
+   value: 19
   }
   casts: {
    key: "spell_id:58426"
@@ -533,7 +533,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:48672 tag:4"
-   value: 5.7
+   value: 5.6
   }
   casts: {
    key: "spell_id:48672 tag:5"
@@ -565,7 +565,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57968"
-   value: 163.4
+   value: 163.6
   }
   casts: {
    key: "spell_id:57968 tag:1"
@@ -605,11 +605,11 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57993 tag:4"
-   value: 14.8
+   value: 14.7
   }
   casts: {
    key: "spell_id:57993 tag:5"
-   value: 9.5
+   value: 9.4
   }
   casts: {
    key: "spell_id:58426"
@@ -637,7 +637,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:6774 tag:5"
-   value: 1
+   value: 1.1
   }
   casts: {
    key: "spell_id:8647 tag:1"
@@ -706,15 +706,15 @@ casts_results: {
   }
   casts: {
    key: "spell_id:48664"
-   value: 62.9
+   value: 62.8
   }
   casts: {
    key: "spell_id:48665"
-   value: 62.9
+   value: 62.8
   }
   casts: {
    key: "spell_id:48666"
-   value: 62.9
+   value: 62.8
   }
   casts: {
    key: "spell_id:48668 tag:1"
@@ -786,11 +786,11 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57968"
-   value: 182.1
+   value: 182.2
   }
   casts: {
    key: "spell_id:57968 tag:1"
-   value: 319.6
+   value: 319.8
   }
   casts: {
    key: "spell_id:57968 tag:2"
@@ -798,7 +798,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57973"
-   value: 324.6
+   value: 324.8
   }
   casts: {
    key: "spell_id:57975"
@@ -927,15 +927,15 @@ casts_results: {
   }
   casts: {
    key: "spell_id:48664"
-   value: 60.3
+   value: 60.2
   }
   casts: {
    key: "spell_id:48665"
-   value: 60.3
+   value: 60.2
   }
   casts: {
    key: "spell_id:48666"
-   value: 60.3
+   value: 60.2
   }
   casts: {
    key: "spell_id:48668 tag:1"
@@ -1007,7 +1007,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57968"
-   value: 180.3
+   value: 179.8
   }
   casts: {
    key: "spell_id:57968 tag:1"
@@ -1051,7 +1051,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57993 tag:5"
-   value: 19.1
+   value: 19
   }
   casts: {
    key: "spell_id:58426"
@@ -1148,15 +1148,15 @@ casts_results: {
   }
   casts: {
    key: "spell_id:48664"
-   value: 62.9
+   value: 62.8
   }
   casts: {
    key: "spell_id:48665"
-   value: 62.9
+   value: 62.8
   }
   casts: {
    key: "spell_id:48666"
-   value: 62.9
+   value: 62.8
   }
   casts: {
    key: "spell_id:48668 tag:1"
@@ -1232,7 +1232,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57968 tag:1"
-   value: 320.1
+   value: 319.9
   }
   casts: {
    key: "spell_id:57968 tag:2"
@@ -1240,7 +1240,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57973"
-   value: 325.1
+   value: 324.9
   }
   casts: {
    key: "spell_id:57975"
@@ -1272,7 +1272,7 @@ casts_results: {
   }
   casts: {
    key: "spell_id:57993 tag:5"
-   value: 20
+   value: 19.9
   }
   casts: {
    key: "spell_id:58426"
diff --git a/sim/rogue/rogue.go b/sim/rogue/rogue.go
index 9c4b23421d..fbf1d2a6ae 100644
--- a/sim/rogue/rogue.go
+++ b/sim/rogue/rogue.go
@@ -311,11 +311,11 @@ func init() {
 	}
 	core.BaseStats[core.BaseStatsKey{Race: proto.Race_RaceHuman, Class: proto.Class_ClassRogue}] = stats.Stats{
 		stats.Health:    3524,
-		stats.Strength:  115,
-		stats.Agility:   204,
-		stats.Stamina:   89,
-		stats.Intellect: 39,
-		stats.Spirit:    58,
+		stats.Strength:  113,
+		stats.Agility:   189,
+		stats.Stamina:   107,
+		stats.Intellect: 43,
+		stats.Spirit:    69,
 
 		stats.AttackPower: 140,
 		stats.MeleeCrit:   -0.3 * core.CritRatingPerCritChance,
@@ -325,7 +325,7 @@ func init() {
 		stats.Health:    3524,
 		stats.Strength:  109,
 		stats.Agility:   193,
-		stats.Stamina:   105,
+		stats.Stamina:   107,
 		stats.Intellect: 43,
 		stats.Spirit:    67,