diff --git a/sim/rogue/dps_rogue/TestCombatDaggers.results b/sim/rogue/dps_rogue/TestCombatDaggers.results
index ed038ca6a..0a35416f6 100644
--- a/sim/rogue/dps_rogue/TestCombatDaggers.results
+++ b/sim/rogue/dps_rogue/TestCombatDaggers.results
@@ -50,8 +50,8 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestCombatDaggers-Phase5-StatWeights-Default"
  value: {
-  weights: 0.23784
-  weights: 0.23784
+  weights: 0.4147
+  weights: 0.51313
   weights: 0
   weights: 0
   weights: 0
@@ -67,9 +67,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.18802
-  weights: 9.55169
-  weights: 0
+  weights: 0.32782
+  weights: 12.66673
+  weights: 1.79148
   weights: 0
   weights: 0
   weights: 0
@@ -99,99 +99,135 @@ stat_weights_results: {
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-BloodfangArmor"
  value: {
-  dps: 529.55788
-  tps: 375.98609
+  dps: 1008.01124
+  tps: 715.68798
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-BonescytheArmor"
  value: {
-  dps: 573.78383
-  tps: 407.38652
+  dps: 1111.47914
+  tps: 771.0513
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-DarkmantleArmor"
  value: {
-  dps: 499.68645
-  tps: 354.77738
+  dps: 1003.38314
+  tps: 712.40203
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-Deathdealer'sEmbrace"
  value: {
-  dps: 533.65442
-  tps: 378.89464
+  dps: 1014.36299
+  tps: 720.19773
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-Madcap'sOutfit"
  value: {
-  dps: 486.09929
-  tps: 345.1305
+  dps: 949.34829
+  tps: 674.03729
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-NightslayerArmor"
  value: {
-  dps: 491.63521
-  tps: 349.061
+  dps: 953.69678
+  tps: 677.12471
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Average-Default"
  value: {
-  dps: 497.26339
-  tps: 353.05701
+  dps: 953.11799
+  tps: 676.71377
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongMultiTarget"
- value: {}
+ value: {
+  dps: 343.11029
+  tps: 243.60831
+ }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongSingleTarget"
- value: {}
+ value: {
+  dps: 287.74263
+  tps: 204.29727
+ }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 367.73363
+  tps: 261.09088
+ }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-LongMultiTarget"
- value: {}
+ value: {
+  dps: 158.99959
+  tps: 112.88971
+ }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-LongSingleTarget"
- value: {}
+ value: {
+  dps: 135.3063
+  tps: 96.06747
+ }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 172.80531
+  tps: 122.69177
+ }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongMultiTarget"
- value: {}
+ value: {
+  dps: 348.87683
+  tps: 247.70255
+ }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongSingleTarget"
- value: {}
+ value: {
+  dps: 285.90747
+  tps: 202.9943
+ }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 367.85945
+  tps: 261.18021
+ }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-LongMultiTarget"
- value: {}
+ value: {
+  dps: 163.07044
+  tps: 115.78001
+ }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-LongSingleTarget"
- value: {}
+ value: {
+  dps: 136.00811
+  tps: 96.56576
+ }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-ShortSingleTarget"
- value: {}
+ value: {
+  dps: 176.04493
+  tps: 124.9919
+ }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-SwitchInFrontOfTarget-Default"
diff --git a/sim/rogue/dps_rogue/TestCombatSinisterStrike.results b/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
index 8f1f17d5c..6d0158cdf 100644
--- a/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
+++ b/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
@@ -1,11 +1,11 @@
 character_stats_results: {
  key: "TestCombatSinisterStrike-Phase5-CharacterStats-Default"
  value: {
-  final_stats: 264.385
-  final_stats: 452.87
-  final_stats: 453.882
+  final_stats: 242.88
+  final_stats: 465.52
+  final_stats: 493.16025
   final_stats: 127.765
-  final_stats: 197.90925
+  final_stats: 200.56575
   final_stats: 0
   final_stats: 0
   final_stats: 0
@@ -18,30 +18,30 @@ character_stats_results: {
   final_stats: 21
   final_stats: 0
   final_stats: 0
-  final_stats: 1910.255
-  final_stats: 9
-  final_stats: 40.62402
+  final_stats: 1891.4
+  final_stats: 7
+  final_stats: 43.06044
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 2410.74
-  final_stats: 1118.87
-  final_stats: 7
-  final_stats: 5.28
+  final_stats: 2334.04
+  final_stats: 1121.52
+  final_stats: 0
+  final_stats: 5
   final_stats: 0
-  final_stats: 35.52803
-  final_stats: 5.28
+  final_stats: 36.12088
+  final_stats: 5
   final_stats: 0
-  final_stats: 6181.82
+  final_stats: 6574.6025
   final_stats: 27
   final_stats: 60
   final_stats: 60
   final_stats: 60
   final_stats: 60
-  final_stats: 484
+  final_stats: 384
   final_stats: 0
   final_stats: 0
   final_stats: 0
@@ -50,8 +50,8 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestCombatSinisterStrike-Phase5-StatWeights-Default"
  value: {
-  weights: 0.44901
-  weights: 0.75562
+  weights: 0.44745
+  weights: 0.54065
   weights: 0
   weights: 0
   weights: 0
@@ -67,9 +67,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.35495
-  weights: 7.9793
-  weights: 7.99629
+  weights: 0.35371
+  weights: 13.13306
+  weights: 2.04047
   weights: 0
   weights: 0
   weights: 0
@@ -99,140 +99,140 @@ stat_weights_results: {
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-BloodfangArmor"
  value: {
-  dps: 1026.15222
-  tps: 728.56808
+  dps: 1066.93953
+  tps: 757.52706
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-BonescytheArmor"
  value: {
-  dps: 1133.48406
-  tps: 790.12872
+  dps: 1180.2534
+  tps: 820.87105
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-DarkmantleArmor"
  value: {
-  dps: 1007.17045
-  tps: 715.09102
+  dps: 1067.67342
+  tps: 758.04813
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-Deathdealer'sEmbrace"
  value: {
-  dps: 1027.36021
-  tps: 729.42575
+  dps: 1078.94714
+  tps: 766.05247
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-Madcap'sOutfit"
  value: {
-  dps: 956.46629
-  tps: 679.09106
+  dps: 1011.30553
+  tps: 718.02693
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-NightslayerArmor"
  value: {
-  dps: 967.96418
-  tps: 687.25457
+  dps: 1008.42824
+  tps: 715.98405
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Average-Default"
  value: {
-  dps: 949.44625
-  tps: 674.10684
+  dps: 968.08711
+  tps: 687.34185
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 270.93471
-  tps: 192.36365
+  dps: 313.4762
+  tps: 222.5681
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 224.9119
-  tps: 159.68745
+  dps: 262.77244
+  tps: 186.56843
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 281.23667
-  tps: 199.67803
+  dps: 332.66324
+  tps: 236.1909
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 108.35262
-  tps: 76.93036
+  dps: 135.13497
+  tps: 95.94583
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 91.49883
-  tps: 64.96417
+  dps: 115.11242
+  tps: 81.72982
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 115.61798
-  tps: 82.08877
+  dps: 145.02706
+  tps: 102.96921
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 275.88229
-  tps: 195.87643
+  dps: 316.39215
+  tps: 224.63843
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 223.52691
-  tps: 158.70411
+  dps: 259.87991
+  tps: 184.51473
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 285.0833
-  tps: 202.40914
+  dps: 328.30548
+  tps: 233.09689
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 111.69395
-  tps: 79.30271
+  dps: 138.13593
+  tps: 98.07651
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 92.24058
-  tps: 65.49081
+  dps: 115.4116
+  tps: 81.94224
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 117.92884
-  tps: 83.72948
+  dps: 145.69274
+  tps: 103.44185
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 738.35809
-  tps: 524.23424
+  dps: 732.03487
+  tps: 519.74476
  }
 }
diff --git a/sim/warlock/dps/TestWarlockDSRuin.results b/sim/warlock/dps/TestWarlockDSRuin.results
index 695113d49..ea3a204c1 100644
--- a/sim/warlock/dps/TestWarlockDSRuin.results
+++ b/sim/warlock/dps/TestWarlockDSRuin.results
@@ -106,8 +106,8 @@ dps_results: {
 dps_results: {
  key: "TestWarlockDSRuin-Phase1-AllItems-DeathmistRaiment"
  value: {
-  dps: 861.87319
-  tps: 922.49357
+  dps: 793.71062
+  tps: 846.83968
  }
 }
 dps_results: {
@@ -155,8 +155,8 @@ dps_results: {
 dps_results: {
  key: "TestWarlockDSRuin-Phase1-AllItems-PlagueheartRaiment"
  value: {
-  dps: 1007.47674
-  tps: 1069.18079
+  dps: 941.36791
+  tps: 996.27398
  }
 }
 dps_results: {
diff --git a/sim/warlock/dps/TestWarlockSMRuin.results b/sim/warlock/dps/TestWarlockSMRuin.results
index 0fe707b71..bd91e54a1 100644
--- a/sim/warlock/dps/TestWarlockSMRuin.results
+++ b/sim/warlock/dps/TestWarlockSMRuin.results
@@ -106,8 +106,8 @@ dps_results: {
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-AllItems-DeathmistRaiment"
  value: {
-  dps: 1080.97179
-  tps: 903.66134
+  dps: 993.7709
+  tps: 821.18879
  }
 }
 dps_results: {
@@ -155,8 +155,8 @@ dps_results: {
 dps_results: {
  key: "TestWarlockSMRuin-Phase1-AllItems-PlagueheartRaiment"
  value: {
-  dps: 1235.01715
-  tps: 1049.06851
+  dps: 1138.48078
+  tps: 955.41236
  }
 }
 dps_results: {