diff --git a/sim/rogue/TestSubtlety.results b/sim/rogue/TestSubtlety.results
index eabd1f86dc..be3e2bd860 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: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-AshtongueTalismanofLethality-32492"
  value: {
-  dps: 7878.76162
-  tps: 5592.3239
+  dps: 7865.59773
+  tps: 5581.01704
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 8088.69703
-  tps: 5742.97489
+  dps: 8066.79289
+  tps: 5725.82584
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 7852.55406
-  tps: 5572.10921
-  hps: 87.956
+  dps: 7831.01126
+  tps: 5555.66285
+  hps: 87.65991
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 7852.55406
-  tps: 5572.10921
-  hps: 87.956
+  dps: 7831.01126
+  tps: 5555.66285
+  hps: 87.65991
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 8136.09891
-  tps: 5773.22589
+  dps: 8084.55621
+  tps: 5735.76692
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BlackBruise-50035"
  value: {
-  dps: 8102.69756
-  tps: 5750.01889
+  dps: 8027.1198
+  tps: 5697.50631
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BlackBruise-50692"
  value: {
-  dps: 8197.68363
-  tps: 5817.46441
+  dps: 8116.77135
+  tps: 5761.16213
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5783.5765
-  tps: 4103.09378
+  dps: 5802.81336
+  tps: 4117.49213
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BonescytheBattlegear"
  value: {
-  dps: 6944.18379
-  tps: 4925.98454
+  dps: 6892.11049
+  tps: 4892.16273
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5626.15037
+  dps: 8070.06154
+  tps: 5611.64877
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 8284.15256
-  tps: 5878.25648
+  dps: 8231.21659
+  tps: 5839.81147
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
   hps: 64
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 8021.47682
-  tps: 5693.24544
+  dps: 7972.47281
+  tps: 5657.63307
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 8057.04862
-  tps: 5718.95432
+  dps: 8024.87649
+  tps: 5693.22111
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 8046.72564
-  tps: 5710.34752
+  dps: 8064.22633
+  tps: 5720.86608
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Death'sChoice-47464"
  value: {
-  dps: 8422.7088
-  tps: 5975.55819
+  dps: 8372.66837
+  tps: 5940.07186
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 8015.17955
-  tps: 5687.99931
+  dps: 7971.2199
+  tps: 5653.9747
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 8297.62964
-  tps: 5888.82288
+  dps: 8306.01241
+  tps: 5893.99838
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 8395.43446
-  tps: 5956.56447
+  dps: 8405.86233
+  tps: 5965.72913
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 8134.97415
-  tps: 5772.04213
+  dps: 8088.7361
+  tps: 5739.55178
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 8092.31187
-  tps: 5741.62372
+  dps: 8030.67993
+  tps: 5696.88666
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 8061.86066
-  tps: 5721.1277
+  dps: 8045.43805
+  tps: 5709.94126
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 8136.09891
-  tps: 5773.22589
+  dps: 8084.55621
+  tps: 5735.76692
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 8135.25822
-  tps: 5773.60444
+  dps: 8084.60986
+  tps: 5734.86833
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7961.06654
-  tps: 5651.1946
+  dps: 7977.49586
+  tps: 5660.02592
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 8066.40849
-  tps: 5725.18209
+  dps: 8043.53858
+  tps: 5708.48275
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 8005.24255
-  tps: 5681.73781
+  dps: 7963.83184
+  tps: 5648.29894
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7965.80386
-  tps: 5654.1639
+  dps: 7959.29921
+  tps: 5648.28715
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 8106.97223
-  tps: 5752.65803
+  dps: 8085.11483
+  tps: 5735.956
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Gladiator'sVestments"
  value: {
-  dps: 7290.25909
-  tps: 5173.71204
+  dps: 7269.34859
+  tps: 5158.41445
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 8013.15644
-  tps: 5687.30533
+  dps: 7958.51007
+  tps: 5649.78275
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Heartpierce-49982"
  value: {
-  dps: 8293.74535
-  tps: 5886.55499
+  dps: 8236.5787
+  tps: 5843.63293
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Heartpierce-50641"
  value: {
-  dps: 8293.74535
-  tps: 5886.55499
+  dps: 8236.5787
+  tps: 5843.63293
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 8136.09891
-  tps: 5773.22589
+  dps: 8084.55621
+  tps: 5735.76692
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 8135.25822
-  tps: 5773.60444
+  dps: 8084.60986
+  tps: 5734.86833
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-IncisorFragment-37723"
  value: {
-  dps: 8048.56647
-  tps: 5711.23728
+  dps: 8025.47772
+  tps: 5693.67835
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 8127.0879
-  tps: 5765.93424
+  dps: 8105.22421
+  tps: 5751.12506
   hps: 12.78749
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 8080.02577
-  tps: 5731.972
+  dps: 8063.39107
+  tps: 5723.82294
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7923.33057
-  tps: 5622.72376
+  dps: 7884.95249
+  tps: 5594.76649
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 8120.38638
-  tps: 5761.1791
+  dps: 8098.52656
+  tps: 5746.37213
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 8127.0879
-  tps: 5765.93424
+  dps: 8105.22421
+  tps: 5751.12506
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 8028.09857
-  tps: 5696.35815
+  dps: 7977.72949
+  tps: 5660.62999
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 8046.72174
-  tps: 5709.5806
+  dps: 7996.16322
+  tps: 5673.71794
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 8293.74535
-  tps: 5886.55499
+  dps: 8236.5787
+  tps: 5843.63293
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Shadowblade'sBattlegear"
  value: {
-  dps: 8456.59541
-  tps: 6000.54633
+  dps: 8508.52901
+  tps: 6037.10112
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-Slayer'sArmor"
  value: {
-  dps: 5362.80006
-  tps: 3802.86766
+  dps: 5299.25801
+  tps: 3762.16213
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SoulPreserver-37111"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SouloftheDead-40382"
  value: {
-  dps: 8011.55548
-  tps: 5686.21999
+  dps: 7973.19523
+  tps: 5654.943
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SparkofLife-37657"
  value: {
-  dps: 7963.72971
-  tps: 5651.46266
+  dps: 7950.33419
+  tps: 5643.13437
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 8046.03351
-  tps: 5710.27119
+  dps: 8061.62858
+  tps: 5720.93606
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-StormshroudArmor"
  value: {
-  dps: 6058.18796
-  tps: 4298.23587
+  dps: 5997.9428
+  tps: 4257.47272
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 8127.0879
-  tps: 5765.93424
+  dps: 8105.22421
+  tps: 5751.12506
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 8120.38638
-  tps: 5761.1791
+  dps: 8098.52656
+  tps: 5746.37213
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 8108.65873
-  tps: 5752.85761
+  dps: 8086.80567
+  tps: 5738.05452
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TerrorbladeBattlegear"
  value: {
-  dps: 7434.42061
-  tps: 5276.20716
+  dps: 7391.38958
+  tps: 5245.37048
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TheFistsofFury"
  value: {
-  dps: 6969.8589
-  tps: 4945.14714
+  dps: 6949.4185
+  tps: 4932.42061
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 8158.50934
-  tps: 5791.5549
+  dps: 8146.66078
+  tps: 5780.05304
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 8286.35396
-  tps: 5882.47098
+  dps: 8270.49174
+  tps: 5869.27551
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 8372.6304
-  tps: 5942.54215
+  dps: 8334.61011
+  tps: 5914.75664
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7973.19615
-  tps: 5658.98042
+  dps: 7892.73659
+  tps: 5601.0631
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 8091.90494
-  tps: 5740.96977
+  dps: 8070.06154
+  tps: 5726.17221
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6147.95301
-  tps: 4363.71655
+  dps: 6123.52288
+  tps: 4344.0973
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-VanCleef'sBattlegear"
  value: {
-  dps: 7175.69723
-  tps: 5092.7133
+  dps: 7149.25752
+  tps: 5073.83474
  }
 }
 dps_results: {
  key: "TestSubtlety-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7852.05651
-  tps: 5571.75595
+  dps: 7830.53607
+  tps: 5555.32546
  }
 }
 dps_results: {
  key: "TestSubtlety-Average-Default"
  value: {
-  dps: 8311.04721
-  tps: 5898.06657
+  dps: 8279.79193
+  tps: 5875.95509
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--FullBuffs-LongMultiTarget"
  value: {
-  dps: 31003.75309
-  tps: 22012.6647
+  dps: 31021.01089
+  tps: 22024.91773
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--FullBuffs-LongSingleTarget"
  value: {
-  dps: 8293.74535
-  tps: 5886.55499
+  dps: 8236.5787
+  tps: 5843.63293
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9190.06172
-  tps: 6488.31434
+  dps: 9040.34111
+  tps: 6393.32189
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--NoBuffs-LongMultiTarget"
  value: {
-  dps: 19128.87522
-  tps: 13581.5014
+  dps: 19242.04113
+  tps: 13661.8492
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--NoBuffs-LongSingleTarget"
  value: {
-  dps: 4080.84021
-  tps: 2895.98982
+  dps: 4091.17195
+  tps: 2903.92463
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-BloodElf-p2_hemosub-Subtlety--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3951.18614
-  tps: 2797.29313
+  dps: 4022.36365
+  tps: 2846.22056
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--FullBuffs-LongMultiTarget"
  value: {
-  dps: 30778.33038
-  tps: 21852.61457
+  dps: 30791.05277
+  tps: 21861.64746
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--FullBuffs-LongSingleTarget"
  value: {
-  dps: 8262.17181
-  tps: 5865.74484
+  dps: 8252.04964
+  tps: 5856.82234
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9103.16406
-  tps: 6449.203
+  dps: 9048.95638
+  tps: 6399.05568
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--NoBuffs-LongMultiTarget"
  value: {
-  dps: 19040.08521
-  tps: 13518.4605
+  dps: 18983.83254
+  tps: 13478.52111
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--NoBuffs-LongSingleTarget"
  value: {
-  dps: 4073.19017
-  tps: 2889.89032
+  dps: 4060.91374
+  tps: 2881.30926
  }
 }
 dps_results: {
  key: "TestSubtlety-Settings-Orc-p2_hemosub-Subtlety--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3963.10672
-  tps: 2804.58938
+  dps: 3955.58794
+  tps: 2795.62872
  }
 }
 dps_results: {
  key: "TestSubtlety-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7588.61002
-  tps: 5384.20883
+  dps: 7517.61851
+  tps: 5334.86467
  }
 }
diff --git a/sim/rogue/preparation.go b/sim/rogue/preparation.go
index bfd3209744..fe5973f4a9 100644
--- a/sim/rogue/preparation.go
+++ b/sim/rogue/preparation.go
@@ -12,23 +12,26 @@ func (rogue *Rogue) registerPreparationCD() {
 		return
 	}
 
-	// Spells affected by Preparation are: Cold Blood, Shadowstep, Vanish (Overkill/Master of Subtlety), Evasion, Sprint
-	// If Glyph of Preparation is applied, Blade Flurry, Dismantle, and Kick are also affected
-	var affectedSpells = []*core.Spell{rogue.ColdBlood, rogue.Shadowstep, rogue.Vanish}
-	if rogue.GetCharacter().HasGlyph(int32(proto.RogueMajorGlyph_GlyphOfPreparation)) {
-		affectedSpells = append(affectedSpells, rogue.BladeFlurry)
-	}
-
 	rogue.Preparation = rogue.RegisterSpell(core.SpellConfig{
 		ActionID: core.ActionID{SpellID: 14185},
 		Flags:    core.SpellFlagAPL,
 		Cast: core.CastConfig{
+			DefaultCast: core.Cast{
+				GCD: time.Second,
+			},
 			CD: core.Cooldown{
 				Timer:    rogue.NewTimer(),
 				Duration: time.Minute*8 - time.Second*time.Duration(90*rogue.Talents.FilthyTricks),
 			},
+			IgnoreHaste: true,
 		},
 		ApplyEffects: func(sim *core.Simulation, _ *core.Unit, spell *core.Spell) {
+			// Spells affected by Preparation are: Cold Blood, Shadowstep, Vanish (Overkill/Master of Subtlety), Evasion, Sprint
+			// If Glyph of Preparation is applied, Blade Flurry, Dismantle, and Kick are also affected
+			var affectedSpells = []*core.Spell{rogue.ColdBlood, rogue.Shadowstep, rogue.Vanish}
+			if rogue.GetCharacter().HasGlyph(int32(proto.RogueMajorGlyph_GlyphOfPreparation)) {
+				affectedSpells = append(affectedSpells, rogue.BladeFlurry)
+			}
 			// Reset Cooldown on affected spells
 			for _, affectedSpell := range affectedSpells {
 				if affectedSpell != nil {