diff --git a/sim/rogue/TestSubtlety.results b/sim/rogue/TestSubtlety.results
index be3e2bd860..237791b4a5 100644
--- a/sim/rogue/TestSubtlety.results
+++ b/sim/rogue/TestSubtlety.results
@@ -46,837 +46,837 @@ character_stats_results: {
 dps_results: {
  key: "TestSubtlety-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-AshtongueTalismanofLethality-32492"
  value: {
-  dps: 7865.59773
-  tps: 5581.01704
+  dps: 6792.09945
+  tps: 4822.39061
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 8066.79289
-  tps: 5725.82584
+  dps: 6941.10994
+  tps: 4928.18806
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 7831.01126
-  tps: 5555.66285
-  hps: 87.65991
+  dps: 6767.8544
+  tps: 4805.17662
+  hps: 88.07796
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 7831.01126
-  tps: 5555.66285
-  hps: 87.65991
+  dps: 6767.8544
+  tps: 4805.17662
+  hps: 88.07796
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 8084.55621
-  tps: 5735.76692
+  dps: 6959.29077
+  tps: 4941.09645
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BlackBruise-50035"
  value: {
-  dps: 8027.1198
-  tps: 5697.50631
+  dps: 6913.69408
+  tps: 4908.72279
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BlackBruise-50692"
  value: {
-  dps: 8116.77135
-  tps: 5761.16213
+  dps: 7000.51814
+  tps: 4970.36788
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5802.81336
-  tps: 4117.49213
+  dps: 5042.83057
+  tps: 3580.40971
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BonescytheBattlegear"
  value: {
-  dps: 6892.11049
-  tps: 4892.16273
+  dps: 5913.34965
+  tps: 4198.47825
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5611.64877
+  dps: 6939.11321
+  tps: 4828.23497
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 8231.21659
-  tps: 5839.81147
+  dps: 7083.68759
+  tps: 5029.41819
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
   hps: 64
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7972.47281
-  tps: 5657.63307
+  dps: 6891.68869
+  tps: 4893.09897
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 8024.87649
-  tps: 5693.22111
+  dps: 6945.41498
+  tps: 4931.24464
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 8064.22633
-  tps: 5720.86608
+  dps: 6920.7108
+  tps: 4913.70467
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Death'sChoice-47464"
  value: {
-  dps: 8372.66837
-  tps: 5940.07186
+  dps: 7207.02681
+  tps: 5116.98904
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7971.2199
-  tps: 5653.9747
+  dps: 6887.30127
+  tps: 4889.9839
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 8306.01241
-  tps: 5893.99838
+  dps: 7200.35517
+  tps: 5112.25217
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 8405.86233
-  tps: 5965.72913
+  dps: 7216.07171
+  tps: 5123.41092
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 8088.7361
-  tps: 5739.55178
+  dps: 6964.14859
+  tps: 4944.5455
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 8030.67993
-  tps: 5696.88666
+  dps: 6999.99946
+  tps: 4969.99962
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 8045.43805
-  tps: 5709.94126
+  dps: 6971.33323
+  tps: 4949.64659
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 8084.55621
-  tps: 5735.76692
+  dps: 6959.29077
+  tps: 4941.09645
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 8084.60986
-  tps: 5734.86833
+  dps: 6954.51588
+  tps: 4937.70627
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7977.49586
-  tps: 5660.02592
+  dps: 6883.78061
+  tps: 4887.48423
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 8043.53858
-  tps: 5708.48275
+  dps: 6908.79176
+  tps: 4905.24215
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7963.83184
-  tps: 5648.29894
+  dps: 6875.19573
+  tps: 4881.38897
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7959.29921
-  tps: 5648.28715
+  dps: 6827.88482
+  tps: 4847.79822
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 8085.11483
-  tps: 5735.956
+  dps: 6989.57819
+  tps: 4962.60051
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Gladiator'sVestments"
  value: {
-  dps: 7269.34859
-  tps: 5158.41445
+  dps: 6237.6819
+  tps: 4428.75415
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 7958.51007
-  tps: 5649.78275
+  dps: 6830.77553
+  tps: 4849.85063
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Heartpierce-49982"
  value: {
-  dps: 8236.5787
-  tps: 5843.63293
+  dps: 7099.04193
+  tps: 5040.31977
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Heartpierce-50641"
  value: {
-  dps: 8236.5787
-  tps: 5843.63293
+  dps: 7099.04193
+  tps: 5040.31977
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 8084.55621
-  tps: 5735.76692
+  dps: 6959.29077
+  tps: 4941.09645
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 8084.60986
-  tps: 5734.86833
+  dps: 6954.51588
+  tps: 4937.70627
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-IncisorFragment-37723"
  value: {
-  dps: 8025.47772
-  tps: 5693.67835
+  dps: 6931.4217
+  tps: 4921.30941
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 8105.22421
-  tps: 5751.12506
+  dps: 6969.48555
+  tps: 4948.33474
   hps: 12.78749
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 8063.39107
-  tps: 5723.82294
+  dps: 6977.26195
+  tps: 4953.85598
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7884.95249
-  tps: 5594.76649
+  dps: 6801.7509
+  tps: 4829.24314
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 8098.52656
-  tps: 5746.37213
+  dps: 6963.70034
+  tps: 4944.22724
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 8105.22421
-  tps: 5751.12506
+  dps: 6969.48555
+  tps: 4948.33474
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7977.72949
-  tps: 5660.62999
+  dps: 6922.25704
+  tps: 4914.8025
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7996.16322
-  tps: 5673.71794
+  dps: 6939.94299
+  tps: 4927.35952
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 8236.5787
-  tps: 5843.63293
+  dps: 7099.04193
+  tps: 5040.31977
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Shadowblade'sBattlegear"
  value: {
-  dps: 8508.52901
-  tps: 6037.10112
+  dps: 7380.07448
+  tps: 5239.85288
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Slayer'sArmor"
  value: {
-  dps: 5299.25801
-  tps: 3762.16213
+  dps: 4593.37997
+  tps: 3261.29978
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SoulPreserver-37111"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SouloftheDead-40382"
  value: {
-  dps: 7973.19523
-  tps: 5654.943
+  dps: 6882.89462
+  tps: 4886.85518
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SparkofLife-37657"
  value: {
-  dps: 7950.33419
-  tps: 5643.13437
+  dps: 6847.60572
+  tps: 4861.80006
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 8061.62858
-  tps: 5720.93606
+  dps: 6937.74865
+  tps: 4925.80154
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-StormshroudArmor"
  value: {
-  dps: 5997.9428
-  tps: 4257.47272
+  dps: 5123.23325
+  tps: 3637.49561
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 8105.22421
-  tps: 5751.12506
+  dps: 6969.48555
+  tps: 4948.33474
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 8098.52656
-  tps: 5746.37213
+  dps: 6963.70034
+  tps: 4944.22724
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 8086.80567
-  tps: 5738.05452
+  dps: 6953.57623
+  tps: 4937.03912
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TerrorbladeBattlegear"
  value: {
-  dps: 7391.38958
-  tps: 5245.37048
+  dps: 6400.15989
+  tps: 4544.11352
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TheFistsofFury"
  value: {
-  dps: 6949.4185
-  tps: 4932.42061
+  dps: 5939.25435
+  tps: 4216.87059
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 8146.66078
-  tps: 5780.05304
+  dps: 7054.0499
+  tps: 5008.37543
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 8270.49174
-  tps: 5869.27551
+  dps: 7149.32047
+  tps: 5076.01753
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 8334.61011
-  tps: 5914.75664
+  dps: 7206.6112
+  tps: 5116.69395
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7892.73659
-  tps: 5601.0631
+  dps: 6822.63455
+  tps: 4844.07053
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 8070.06154
-  tps: 5726.17221
+  dps: 6939.11321
+  tps: 4926.77038
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6123.52288
-  tps: 4344.0973
+  dps: 5362.37515
+  tps: 3807.28636
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-VanCleef'sBattlegear"
  value: {
-  dps: 7149.25752
-  tps: 5073.83474
+  dps: 6211.57346
+  tps: 4410.21716
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7830.53607
-  tps: 5555.32546
+  dps: 6767.38798
+  tps: 4804.84546
  }
 }
 dps_results: {
  key: "TestSubtlety-Average-Default"
  value: {
-  dps: 8279.79193
-  tps: 5875.95509
+  dps: 7101.82519
+  tps: 5042.29589
  }
 }
 dps_results: {
- key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--FullBuffs-LongMultiTarget"
+ key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety-combat_expose-FullBuffs-LongMultiTarget"
  value: {
-  dps: 31021.01089
-  tps: 22024.91773
+  dps: 7099.04193
+  tps: 5040.31977
  }
 }
 dps_results: {
- key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--FullBuffs-LongSingleTarget"
+ key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety-combat_expose-FullBuffs-LongSingleTarget"
  value: {
-  dps: 8236.5787
-  tps: 5843.63293
+  dps: 7099.04193
+  tps: 5040.31977
  }
 }
 dps_results: {
- key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--FullBuffs-ShortSingleTarget"
+ key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety-combat_expose-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9040.34111
-  tps: 6393.32189
+  dps: 7868.077
+  tps: 5586.33467
  }
 }
 dps_results: {
- key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--NoBuffs-LongMultiTarget"
+ key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety-combat_expose-NoBuffs-LongMultiTarget"
  value: {
-  dps: 19242.04113
-  tps: 13661.8492
+  dps: 3312.98981
+  tps: 2352.22276
  }
 }
 dps_results: {
- key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--NoBuffs-LongSingleTarget"
+ key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety-combat_expose-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4091.17195
-  tps: 2903.92463
+  dps: 3312.98981
+  tps: 2352.22276
  }
 }
 dps_results: {
- key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--NoBuffs-ShortSingleTarget"
+ key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety-combat_expose-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4022.36365
-  tps: 2846.22056
+  dps: 3152.94455
+  tps: 2238.59063
  }
 }
 dps_results: {
- key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--FullBuffs-LongMultiTarget"
+ key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety-combat_expose-FullBuffs-LongMultiTarget"
  value: {
-  dps: 30791.05277
-  tps: 21861.64746
+  dps: 7127.35609
+  tps: 5060.42282
  }
 }
 dps_results: {
- key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--FullBuffs-LongSingleTarget"
+ key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety-combat_expose-FullBuffs-LongSingleTarget"
  value: {
-  dps: 8252.04964
-  tps: 5856.82234
+  dps: 7127.35609
+  tps: 5060.42282
  }
 }
 dps_results: {
- key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--FullBuffs-ShortSingleTarget"
+ key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety-combat_expose-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9048.95638
-  tps: 6399.05568
+  dps: 7928.49302
+  tps: 5629.23004
  }
 }
 dps_results: {
- key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--NoBuffs-LongMultiTarget"
+ key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety-combat_expose-NoBuffs-LongMultiTarget"
  value: {
-  dps: 18983.83254
-  tps: 13478.52111
+  dps: 3343.79073
+  tps: 2374.09142
  }
 }
 dps_results: {
- key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--NoBuffs-LongSingleTarget"
+ key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety-combat_expose-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4060.91374
-  tps: 2881.30926
+  dps: 3343.79073
+  tps: 2374.09142
  }
 }
 dps_results: {
- key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--NoBuffs-ShortSingleTarget"
+ key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety-combat_expose-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3955.58794
-  tps: 2795.62872
+  dps: 3199.69463
+  tps: 2271.78319
  }
 }
 dps_results: {
  key: "TestSubtlety-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7517.61851
-  tps: 5334.86467
+  dps: 6551.17004
+  tps: 4651.33073
  }
 }
diff --git a/sim/rogue/rogue_test.go b/sim/rogue/rogue_test.go
index 74c4095886..2edf03bf44 100644
--- a/sim/rogue/rogue_test.go
+++ b/sim/rogue/rogue_test.go
@@ -91,6 +91,7 @@ func TestSubtlety(t *testing.T) {
 		Glyphs:      SubtletyGlyphs,
 		Consumes:    FullConsumes,
 		SpecOptions: core.SpecOptionsCombo{Label: "Subtlety", SpecOptions: PlayerOptionsSubtletyID},
+		Rotation:    core.GetAplRotation("../../ui/rogue/apls", "combat_expose"),
 		ItemFilter: core.ItemFilter{
 			ArmorType: proto.ArmorType_ArmorTypeLeather,
 			RangedWeaponTypes: []proto.RangedWeaponType{
@@ -129,6 +130,7 @@ func GenerateCriticalDamageMultiplierTestCase(
 		Race:          proto.Race_RaceOrc,
 		Equipment:     equipment,
 		TalentsString: talents,
+		Rotation:      core.GetAplRotation("../../ui/rogue/apls", "combat_expose").Rotation,
 	}, spec), nil, nil, nil)
 	encounter := core.MakeSingleTargetEncounter(0.0)
 	env, _, _ := core.NewEnvironment(raid, encounter, false)