diff --git a/sim/rogue/assassination/TestAssassination.results b/sim/rogue/assassination/TestAssassination.results
index 3647d61473..ea58d3146b 100644
--- a/sim/rogue/assassination/TestAssassination.results
+++ b/sim/rogue/assassination/TestAssassination.results
@@ -1716,8 +1716,8 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-AllItems-VestmentsoftheDarkPhoenix"
  value: {
-  dps: 28711.75891
-  tps: 20385.34883
+  dps: 28662.1085
+  tps: 20350.09703
  }
 }
 dps_results: {
@@ -2122,169 +2122,169 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 36888.22712
-  tps: 26190.64125
+  dps: 37022.60092
+  tps: 26286.04665
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 36888.22712
-  tps: 26190.64125
+  dps: 37022.60092
+  tps: 26286.04665
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-Assassination-mutilate-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 48973.5149
-  tps: 34771.19558
+  dps: 48893.84923
+  tps: 34714.63295
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 21838.39135
-  tps: 15505.25786
+  dps: 21878.01455
+  tps: 15533.39033
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 21838.39135
-  tps: 15505.25786
+  dps: 21878.01455
+  tps: 15533.39033
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-Assassination-mutilate-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 24616.0485
-  tps: 17477.39443
+  dps: 24586.38806
+  tps: 17456.33552
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 27732.97423
-  tps: 19690.4117
+  dps: 27809.47621
+  tps: 19744.72811
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 27732.97423
-  tps: 19690.4117
+  dps: 27809.47621
+  tps: 19744.72811
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 36904.91393
-  tps: 26202.48889
+  dps: 36940.99069
+  tps: 26228.10339
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 16463.05382
-  tps: 11688.76821
+  dps: 16510.36327
+  tps: 11722.35792
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 16463.05382
-  tps: 11688.76821
+  dps: 16510.36327
+  tps: 11722.35792
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 18911.78848
-  tps: 13427.36982
+  dps: 18867.43036
+  tps: 13395.87556
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 37722.3891
-  tps: 26782.89626
+  dps: 37761.63564
+  tps: 26810.7613
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 37722.3891
-  tps: 26782.89626
+  dps: 37761.63564
+  tps: 26810.7613
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 50171.27167
-  tps: 35621.60289
+  dps: 50127.73343
+  tps: 35590.69073
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 22267.39077
-  tps: 15809.84744
+  dps: 22298.3782
+  tps: 15831.84852
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 22267.39077
-  tps: 15809.84744
+  dps: 22298.3782
+  tps: 15831.84852
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 25117.92772
-  tps: 17833.72868
+  dps: 25084.39702
+  tps: 17809.92189
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 21877.34869
-  tps: 15532.91757
+  dps: 21843.90026
+  tps: 15509.16919
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 21877.34869
-  tps: 15532.91757
+  dps: 21843.90026
+  tps: 15509.16919
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 27710.53364
-  tps: 19674.47888
+  dps: 27730.19113
+  tps: 19688.4357
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 12670.35637
-  tps: 8995.95302
+  dps: 12717.49877
+  tps: 9029.42412
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 12670.35637
-  tps: 8995.95302
+  dps: 12717.49877
+  tps: 9029.42412
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Human-p3_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 14039.92419
-  tps: 9968.34617
+  dps: 14021.49427
+  tps: 9955.26093
  }
 }
 dps_results: {
@@ -2458,169 +2458,169 @@ dps_results: {
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 37245.37533
-  tps: 26444.21648
+  dps: 37348.15216
+  tps: 26517.18803
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-Assassination-mutilate-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 37245.37533
-  tps: 26444.21648
+  dps: 37348.15216
+  tps: 26517.18803
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-Assassination-mutilate-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 49681.67641
-  tps: 35273.99025
+  dps: 49595.07568
+  tps: 35212.50373
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 22046.73328
-  tps: 15653.18063
+  dps: 22085.6842
+  tps: 15680.83578
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-Assassination-mutilate-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 22046.73328
-  tps: 15653.18063
+  dps: 22085.6842
+  tps: 15680.83578
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-Assassination-mutilate-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 24997.19459
-  tps: 17748.00816
+  dps: 24967.26142
+  tps: 17726.75561
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 27998.71294
-  tps: 19879.08619
+  dps: 28051.17607
+  tps: 19916.33501
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 27998.71294
-  tps: 19879.08619
+  dps: 28051.17607
+  tps: 19916.33501
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Deadly OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 37444.52732
-  tps: 26585.6144
+  dps: 37475.69023
+  tps: 26607.74006
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 16617.92435
-  tps: 11798.72629
+  dps: 16664.92438
+  tps: 11832.09631
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 16617.92435
-  tps: 11798.72629
+  dps: 16664.92438
+  tps: 11832.09631
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Deadly OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 19207.15305
-  tps: 13637.07867
+  dps: 19162.89839
+  tps: 13605.65786
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 38068.96384
-  tps: 27028.96432
+  dps: 38091.40825
+  tps: 27044.89986
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 38068.96384
-  tps: 27028.96432
+  dps: 38091.40825
+  tps: 27044.89986
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Deadly-mutilate-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 50897.79149
-  tps: 36137.43196
+  dps: 50848.21525
+  tps: 36102.23283
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 22480.2149
-  tps: 15960.95258
+  dps: 22512.72781
+  tps: 15984.03675
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 22480.2149
-  tps: 15960.95258
+  dps: 22512.72781
+  tps: 15984.03675
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Deadly-mutilate-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 25508.59932
-  tps: 18111.10551
+  dps: 25474.00026
+  tps: 18086.54018
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 22070.75071
-  tps: 15670.23301
+  dps: 22047.59184
+  tps: 15653.79021
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 22070.75071
-  tps: 15670.23301
+  dps: 22047.59184
+  tps: 15653.79021
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Instant-mutilate-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 28125.20371
-  tps: 19968.89463
+  dps: 28142.9136
+  tps: 19981.46866
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 12793.52877
-  tps: 9083.40542
+  dps: 12841.80159
+  tps: 9117.67913
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 12793.52877
-  tps: 9083.40542
+  dps: 12841.80159
+  tps: 9117.67913
  }
 }
 dps_results: {
  key: "TestAssassination-Settings-Orc-p3_assassination-MH Instant OH Instant-mutilate-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 14275.3519
-  tps: 10135.49985
+  dps: 14255.81864
+  tps: 10121.63123
  }
 }
 dps_results: {
diff --git a/sim/rogue/combat/TestCombat.results b/sim/rogue/combat/TestCombat.results
index b7b64e4155..6932bbe19c 100644
--- a/sim/rogue/combat/TestCombat.results
+++ b/sim/rogue/combat/TestCombat.results
@@ -1763,8 +1763,8 @@ dps_results: {
 dps_results: {
  key: "TestCombat-AllItems-VestmentsoftheDarkPhoenix"
  value: {
-  dps: 29524.677
-  tps: 20962.52067
+  dps: 29492.11673
+  tps: 20939.40288
  }
 }
 dps_results: {
@@ -2169,169 +2169,169 @@ dps_results: {
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-Combat-combat-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 37800.80517
-  tps: 26838.57167
+  dps: 37734.68665
+  tps: 26791.62752
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-Combat-combat-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 38280.15554
-  tps: 27178.91043
+  dps: 38083.75856
+  tps: 27039.46858
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-Combat-combat-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 46132.84442
-  tps: 32754.31954
+  dps: 45856.7902
+  tps: 32558.32104
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-Combat-combat-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 21754.81802
-  tps: 15445.9208
+  dps: 21868.83996
+  tps: 15526.87637
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-Combat-combat-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 22012.38167
-  tps: 15628.79098
+  dps: 22070.31283
+  tps: 15669.92211
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-Combat-combat-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 22465.74984
-  tps: 15950.68239
+  dps: 22407.13367
+  tps: 15909.0649
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 33353.56325
-  tps: 23681.02991
+  dps: 33343.26233
+  tps: 23673.71626
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 33360.88406
-  tps: 23686.22768
+  dps: 33262.77134
+  tps: 23616.56765
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 40150.90814
-  tps: 28507.14478
+  dps: 40024.45194
+  tps: 28417.36088
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 19432.03939
-  tps: 13796.74797
+  dps: 19553.40221
+  tps: 13882.91557
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 19404.37053
-  tps: 13777.10308
+  dps: 19447.90892
+  tps: 13808.01534
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 19909.31952
-  tps: 14135.61686
+  dps: 19822.11537
+  tps: 14073.70192
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 36597.51348
-  tps: 25984.23457
+  dps: 36572.10774
+  tps: 25966.1965
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 36991.99144
-  tps: 26264.31392
+  dps: 36898.34376
+  tps: 26197.82407
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 44442.16218
-  tps: 31553.93515
+  dps: 44320.25709
+  tps: 31467.38254
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 21167.81068
-  tps: 15029.14558
+  dps: 21297.30349
+  tps: 15121.08548
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 21364.91924
-  tps: 15169.09266
+  dps: 21434.70456
+  tps: 15218.64024
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 21797.19793
-  tps: 15476.01053
+  dps: 21687.90515
+  tps: 15398.41266
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 34876.49139
-  tps: 24762.30889
+  dps: 34746.52279
+  tps: 24670.03118
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 35299.65227
-  tps: 25062.75311
+  dps: 35219.38417
+  tps: 25005.76276
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 43243.28753
-  tps: 30702.73415
+  dps: 43015.46258
+  tps: 30540.97843
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 19350.93729
-  tps: 13739.16548
+  dps: 19429.46188
+  tps: 13794.91794
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 19547.96193
-  tps: 13879.05297
+  dps: 19621.97002
+  tps: 13931.59872
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Human-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 20201.13336
-  tps: 14342.80468
+  dps: 20089.29345
+  tps: 14263.39835
  }
 }
 dps_results: {
@@ -2505,169 +2505,169 @@ dps_results: {
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 38108.31274
-  tps: 27056.90205
+  dps: 38047.91868
+  tps: 27014.02226
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 38580.20795
-  tps: 27391.94765
+  dps: 38391.64269
+  tps: 27258.06631
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 46758.38438
-  tps: 33198.45291
+  dps: 46477.49952
+  tps: 32999.02466
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 21957.09044
-  tps: 15589.53421
+  dps: 22074.72935
+  tps: 15673.05784
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 22216.06706
-  tps: 15773.40761
+  dps: 22275.62251
+  tps: 15815.69198
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-Combat-combat-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 22838.40575
-  tps: 16215.26809
+  dps: 22776.7037
+  tps: 16171.45962
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 33622.32543
-  tps: 23871.85106
+  dps: 33619.33761
+  tps: 23869.72971
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 33621.66016
-  tps: 23871.37871
+  dps: 33528.10615
+  tps: 23804.95536
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 40695.69761
-  tps: 28893.9453
+  dps: 40567.19155
+  tps: 28802.706
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 19641.68343
-  tps: 13945.59523
+  dps: 19735.24979
+  tps: 14012.02735
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 19584.29488
-  tps: 13904.84936
+  dps: 19627.08713
+  tps: 13935.23186
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Deadly-combat-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 20236.97663
-  tps: 14368.25341
+  dps: 20148.24739
+  tps: 14305.25564
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 36895.32191
-  tps: 26195.67856
+  dps: 36872.00952
+  tps: 26179.12676
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 37283.58675
-  tps: 26471.34659
+  dps: 37194.99067
+  tps: 26408.44338
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 45042.60915
-  tps: 31980.2525
+  dps: 44919.14907
+  tps: 31892.59584
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 21400.49299
-  tps: 15194.35003
+  dps: 21497.04163
+  tps: 15262.89955
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 21566.1356
-  tps: 15311.95628
+  dps: 21634.37099
+  tps: 15360.4034
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Deadly OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 22157.40545
-  tps: 15731.75787
+  dps: 22046.09355
+  tps: 15652.72642
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 35163.82466
-  tps: 24966.31551
+  dps: 35034.77178
+  tps: 24874.68797
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 35578.60964
-  tps: 25260.81285
+  dps: 35510.66376
+  tps: 25212.57127
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 43849.43109
-  tps: 31133.09607
+  dps: 43618.23681
+  tps: 30968.94813
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 19531.0824
-  tps: 13867.0685
+  dps: 19613.36628
+  tps: 13925.49006
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 19728.46794
-  tps: 14007.21224
+  dps: 19805.82064
+  tps: 14062.13265
  }
 }
 dps_results: {
  key: "TestCombat-Settings-Orc-p3_combat-MH Instant OH Instant-combat-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 20548.03412
-  tps: 14589.10423
+  dps: 20433.35669
+  tps: 14507.68325
  }
 }
 dps_results: {
diff --git a/sim/rogue/items.go b/sim/rogue/items.go
index 4f60c627c6..00b80f22f8 100644
--- a/sim/rogue/items.go
+++ b/sim/rogue/items.go
@@ -116,7 +116,7 @@ var Tier12 = core.NewItemSet(core.ItemSet{
 			core.MakeProcTriggerAura(&agent.GetCharacter().Unit, core.ProcTrigger{
 				Name:           "Rogue T12 4P Bonus",
 				Callback:       core.CallbackOnApplyEffects,
-				ClassSpellMask: RogueSpellTricksOfTheTradeThreat,
+				ClassSpellMask: RogueSpellTricksOfTheTrade,
 				Handler: func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
 					if rogue.T12ToTLastBuff == 3 { // any of 3
 						randomStat := int(math.Mod(sim.RandomFloat("Rogue T12 4P Bonus Initial")*10, 3))
diff --git a/sim/rogue/subtlety/TestSubtlety.results b/sim/rogue/subtlety/TestSubtlety.results
index 43d870ba88..6e08379eed 100644
--- a/sim/rogue/subtlety/TestSubtlety.results
+++ b/sim/rogue/subtlety/TestSubtlety.results
@@ -1679,8 +1679,8 @@ dps_results: {
 dps_results: {
  key: "TestSubtlety-AllItems-VestmentsoftheDarkPhoenix"
  value: {
-  dps: 23810.54644
-  tps: 16905.48797
+  dps: 23784.14763
+  tps: 16886.74482
  }
 }
 dps_results: {
@@ -2085,169 +2085,169 @@ dps_results: {
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 28485.69004
-  tps: 20224.83992
+  dps: 28714.12426
+  tps: 20387.02822
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 28485.69004
-  tps: 20224.83992
+  dps: 28714.12426
+  tps: 20387.02822
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 37502.42797
-  tps: 26626.72386
+  dps: 37802.13729
+  tps: 26839.51748
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 16022.33052
-  tps: 11375.85467
+  dps: 15963.28575
+  tps: 11333.93288
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 16022.33052
-  tps: 11375.85467
+  dps: 15963.28575
+  tps: 11333.93288
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 18286.5295
-  tps: 12983.43594
+  dps: 18189.64676
+  tps: 12914.6492
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 30840.65536
-  tps: 21896.8653
+  dps: 30878.65834
+  tps: 21923.84742
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 30840.65536
-  tps: 21896.8653
+  dps: 30878.65834
+  tps: 21923.84742
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 40229.50919
-  tps: 28562.95152
+  dps: 40498.36573
+  tps: 28753.83967
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 17179.69479
-  tps: 12197.5833
+  dps: 17225.07588
+  tps: 12229.80388
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 17179.69479
-  tps: 12197.5833
+  dps: 17225.07588
+  tps: 12229.80388
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 19688.07184
-  tps: 13978.531
+  dps: 19593.97115
+  tps: 13911.71951
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 28510.11583
-  tps: 20242.18224
+  dps: 28491.10159
+  tps: 20228.68213
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 28510.11583
-  tps: 20242.18224
+  dps: 28491.10159
+  tps: 20228.68213
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 38069.11639
-  tps: 27029.07264
+  dps: 38175.6477
+  tps: 27104.70987
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 15566.33605
-  tps: 11052.0986
+  dps: 15704.57141
+  tps: 11150.2457
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 15566.33605
-  tps: 11052.0986
+  dps: 15704.57141
+  tps: 11150.2457
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 17959.72789
-  tps: 12751.4068
+  dps: 17759.61908
+  tps: 12609.32955
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 31023.39863
-  tps: 22026.61303
+  dps: 31131.99894
+  tps: 22103.71924
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 31023.39863
-  tps: 22026.61303
+  dps: 31131.99894
+  tps: 22103.71924
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 40676.91014
-  tps: 28880.6062
+  dps: 40840.74548
+  tps: 28996.92929
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 17316.56614
-  tps: 12294.76196
+  dps: 17299.40845
+  tps: 12282.58
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 17316.56614
-  tps: 12294.76196
+  dps: 17299.40845
+  tps: 12282.58
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Human-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 19565.02137
-  tps: 13891.16517
+  dps: 19417.82797
+  tps: 13786.65786
  }
 }
 dps_results: {
@@ -2421,169 +2421,169 @@ dps_results: {
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 28761.35085
-  tps: 20420.5591
+  dps: 28967.1026
+  tps: 20566.64285
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 28761.35085
-  tps: 20420.5591
+  dps: 28967.1026
+  tps: 20566.64285
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 38004.98373
-  tps: 26983.53845
+  dps: 38308.35682
+  tps: 27198.93334
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 16164.0336
-  tps: 11476.46385
+  dps: 16109.43353
+  tps: 11437.69781
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 16164.0336
-  tps: 11476.46385
+  dps: 16109.43353
+  tps: 11437.69781
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Deadly-subtlety-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 18564.67003
-  tps: 13180.91572
+  dps: 18473.47989
+  tps: 13116.17072
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 31107.1569
-  tps: 22086.0814
+  dps: 31157.70013
+  tps: 22121.96709
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 31107.1569
-  tps: 22086.0814
+  dps: 31157.70013
+  tps: 22121.96709
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 40760.19666
-  tps: 28939.73963
+  dps: 41032.03727
+  tps: 29132.74646
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 17336.54602
-  tps: 12308.94767
+  dps: 17375.78332
+  tps: 12336.80616
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 17336.54602
-  tps: 12308.94767
+  dps: 17375.78332
+  tps: 12336.80616
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Deadly OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 19980.64083
-  tps: 14186.25499
+  dps: 19889.77111
+  tps: 14121.73749
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 28764.47144
-  tps: 20422.77472
+  dps: 28748.02108
+  tps: 20411.09497
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 28764.47144
-  tps: 20422.77472
+  dps: 28748.02108
+  tps: 20411.09497
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 38588.03204
-  tps: 27397.50275
+  dps: 38694.01276
+  tps: 27472.74906
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 15706.40151
-  tps: 11151.54507
+  dps: 15840.90816
+  tps: 11247.04479
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 15706.40151
-  tps: 11151.54507
+  dps: 15840.90816
+  tps: 11247.04479
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-MH Instant OH Instant-subtlety-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 18249.38275
-  tps: 12957.06175
+  dps: 18050.65557
+  tps: 12815.96545
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 31286.68885
-  tps: 22213.54908
+  dps: 31415.29837
+  tps: 22304.86185
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 31286.68885
-  tps: 22213.54908
+  dps: 31415.29837
+  tps: 22304.86185
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 41211.72575
-  tps: 29260.32528
+  dps: 41371.66488
+  tps: 29373.88207
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 17477.78915
-  tps: 12409.23029
+  dps: 17455.67829
+  tps: 12393.53159
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 17477.78915
-  tps: 12409.23029
+  dps: 17455.67829
+  tps: 12393.53159
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p3_subtlety-Subtlety-subtlety-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 19860.51772
-  tps: 14100.96758
+  dps: 19717.15487
+  tps: 13999.17996
  }
 }
 dps_results: {