diff --git a/sim/deathknight/dps/TestFrost.results b/sim/deathknight/dps/TestFrost.results
index b863db8454..495424b24e 100644
--- a/sim/deathknight/dps/TestFrost.results
+++ b/sim/deathknight/dps/TestFrost.results
@@ -46,901 +46,901 @@ character_stats_results: {
 dps_results: {
  key: "TestFrost-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 8052.27132
-  tps: 4703.82737
+  dps: 8014.23857
+  tps: 4683.15394
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 8029.81674
-  tps: 4705.74895
+  dps: 7957.25647
+  tps: 4662.12936
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 7813.76429
-  tps: 4574.90272
-  hps: 61.33921
+  dps: 7778.47089
+  tps: 4555.27668
+  hps: 61.2301
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 7813.76429
-  tps: 4574.90272
-  hps: 61.33921
+  dps: 7778.47089
+  tps: 4555.27668
+  hps: 61.2301
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 8068.44089
-  tps: 4713.52911
+  dps: 8029.88552
+  tps: 4692.54211
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 7786.70853
-  tps: 4547.05262
+  dps: 7772.12074
+  tps: 4538.35286
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 6737.16855
-  tps: 3935.08993
+  dps: 6744.00509
+  tps: 3940.16823
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 6642.16598
-  tps: 3882.59077
+  dps: 6604.85843
+  tps: 3862.11932
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 6360.49523
-  tps: 3713.79021
+  dps: 6359.24055
+  tps: 3714.34906
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4606.15494
+  dps: 8008.1514
+  tps: 4585.91161
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 8251.62573
-  tps: 4823.44001
+  dps: 8210.75713
+  tps: 4801.06508
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 8251.62573
-  tps: 4823.44001
+  dps: 8210.75713
+  tps: 4801.06508
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 8257.41011
-  tps: 4826.91064
+  dps: 8217.15467
+  tps: 4804.9036
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
   hps: 42.66667
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7925.15748
-  tps: 4641.73863
+  dps: 7887.66685
+  tps: 4620.79426
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7985.7163
-  tps: 4678.63063
+  dps: 7914.23623
+  tps: 4636.45278
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 8057.03735
-  tps: 4709.9592
+  dps: 8017.14178
+  tps: 4688.07324
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkrunedBattlegear"
  value: {
-  dps: 7630.44753
-  tps: 4459.73277
+  dps: 7573.76716
+  tps: 4425.52376
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkrunedPlate"
  value: {
-  dps: 6769.37065
-  tps: 3948.96128
+  dps: 6730.44041
+  tps: 3927.15188
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DeadlyGladiator'sSigilofStrife-42620"
  value: {
-  dps: 7709.42364
-  tps: 4498.11876
+  dps: 7666.21282
+  tps: 4474.3385
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Death'sChoice-47464"
  value: {
-  dps: 8448.97682
-  tps: 4937.48772
+  dps: 8407.11786
+  tps: 4914.7747
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7909.96539
-  tps: 4632.62338
+  dps: 7880.55558
+  tps: 4616.52749
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 8243.2054
-  tps: 4824.83831
+  dps: 8261.34321
+  tps: 4837.34199
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 8295.94046
-  tps: 4860.10508
+  dps: 8289.2053
+  tps: 4857.55513
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7833.71319
-  tps: 4586.87206
+  dps: 7798.30124
+  tps: 4567.17489
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 8075.47736
-  tps: 4717.75099
+  dps: 8034.74087
+  tps: 4695.45533
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 7959.60927
-  tps: 4656.87908
+  dps: 7945.05499
+  tps: 4649.50939
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 7973.56441
-  tps: 4665.51755
+  dps: 7903.01685
+  tps: 4625.50812
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 8068.44089
-  tps: 4713.52911
+  dps: 8029.88552
+  tps: 4692.54211
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 8064.27606
-  tps: 4711.03021
+  dps: 8024.15303
+  tps: 4689.10262
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7897.41873
-  tps: 4618.16691
+  dps: 7861.09032
+  tps: 4595.21796
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7951.45637
-  tps: 4657.45674
+  dps: 7926.41066
+  tps: 4644.05752
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7911.00358
-  tps: 4633.24629
+  dps: 7870.62874
+  tps: 4610.57139
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7895.67436
-  tps: 4624.04877
+  dps: 7856.39472
+  tps: 4602.03098
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-FuriousGladiator'sSigilofStrife-42621"
  value: {
-  dps: 7710.24268
-  tps: 4498.61018
+  dps: 7666.97013
+  tps: 4474.79288
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 8056.7304
-  tps: 4720.68239
+  dps: 8020.3945
+  tps: 4700.43084
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 7941.61451
-  tps: 4651.49077
+  dps: 7875.44291
+  tps: 4612.77424
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-HatefulGladiator'sSigilofStrife-42619"
  value: {
-  dps: 7707.5347
-  tps: 4496.98539
+  dps: 7664.43622
+  tps: 4473.27254
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 8068.44089
-  tps: 4713.52911
+  dps: 8029.88552
+  tps: 4692.54211
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 8064.27606
-  tps: 4711.03021
+  dps: 8024.15303
+  tps: 4689.10262
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-IncisorFragment-37723"
  value: {
-  dps: 8021.7314
-  tps: 4699.68298
+  dps: 7987.95809
+  tps: 4680.969
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 8077.43773
-  tps: 4718.92722
+  dps: 8039.37892
+  tps: 4698.23816
   hps: 12.97738
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 8016.01309
-  tps: 4693.69685
+  dps: 7915.83627
+  tps: 4632.72437
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7878.71863
-  tps: 4613.87533
+  dps: 7844.79898
+  tps: 4595.07353
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7826.72571
-  tps: 4582.67958
+  dps: 7791.34698
+  tps: 4563.00234
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 8071.71066
-  tps: 4715.49097
+  dps: 8033.57293
+  tps: 4694.75456
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 8077.72354
-  tps: 4719.0987
+  dps: 8039.55447
+  tps: 4698.34349
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 7867.06673
-  tps: 4606.88418
+  dps: 7831.49624
+  tps: 4587.09189
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7873.91445
-  tps: 4610.99282
+  dps: 7838.31142
+  tps: 4591.181
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7839.24766
-  tps: 4589.80512
+  dps: 7795.59447
+  tps: 4565.40226
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7841.04021
-  tps: 4590.88064
+  dps: 7797.43642
+  tps: 4566.50742
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 8251.62573
-  tps: 4823.44001
+  dps: 8210.75713
+  tps: 4801.06508
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-RelentlessGladiator'sSigilofStrife-42622"
  value: {
-  dps: 7711.19823
-  tps: 4499.18352
+  dps: 7667.85366
+  tps: 4475.323
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SavageGladiator'sSigilofStrife-42618"
  value: {
-  dps: 7707.28493
-  tps: 4496.83553
+  dps: 7664.20868
+  tps: 4473.13601
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ScourgeborneBattlegear"
  value: {
-  dps: 7416.61591
-  tps: 4336.00865
+  dps: 7441.7675
+  tps: 4353.45539
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ScourgebornePlate"
  value: {
-  dps: 6690.85953
-  tps: 3905.16716
+  dps: 6619.15795
+  tps: 3862.58198
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Scourgelord'sBattlegear"
  value: {
-  dps: 8445.57673
-  tps: 4946.37243
+  dps: 8432.56595
+  tps: 4940.18945
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Scourgelord'sPlate"
  value: {
-  dps: 7069.39732
-  tps: 4124.67709
+  dps: 7059.19051
+  tps: 4118.73645
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7827.39823
-  tps: 4583.08308
+  dps: 7791.56245
+  tps: 4563.13161
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Shadowmourne-49623"
  value: {
-  dps: 8251.62573
-  tps: 4823.44001
+  dps: 8210.75713
+  tps: 4801.06508
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigilofDeflection-45144"
  value: {
-  dps: 7705.32842
-  tps: 4495.66163
+  dps: 7662.42627
+  tps: 4472.06657
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigilofHauntedDreams-40715"
  value: {
-  dps: 7711.65594
-  tps: 4499.45814
+  dps: 7675.02979
+  tps: 4479.62868
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigilofInsolence-47672"
  value: {
-  dps: 7705.32842
-  tps: 4495.66163
+  dps: 7662.42627
+  tps: 4472.06657
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigilofVirulence-47673"
  value: {
-  dps: 8128.60678
-  tps: 4742.35707
+  dps: 8080.70539
+  tps: 4715.97323
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigiloftheBoneGryphon-50462"
  value: {
-  dps: 7705.32842
-  tps: 4495.66163
+  dps: 7662.42627
+  tps: 4472.06657
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigiloftheHangedMan-50459"
  value: {
-  dps: 8164.92711
-  tps: 4763.45847
+  dps: 8119.82567
+  tps: 4738.77462
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigiloftheUnfalteringKnight-40714"
  value: {
-  dps: 7705.32842
-  tps: 4495.66163
+  dps: 7662.42627
+  tps: 4472.06657
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SoulPreserver-37111"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SouloftheDead-40382"
  value: {
-  dps: 7914.63418
-  tps: 4635.42465
+  dps: 7875.18801
+  tps: 4613.30695
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SparkofLife-37657"
  value: {
-  dps: 7894.61965
-  tps: 4619.74272
+  dps: 7874.80739
+  tps: 4610.76139
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 7981.50451
-  tps: 4675.59564
+  dps: 7957.58108
+  tps: 4661.35269
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-StormshroudArmor"
  value: {
-  dps: 6304.44559
-  tps: 3683.23378
+  dps: 6321.40066
+  tps: 3692.20506
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 8077.72354
-  tps: 4719.0987
+  dps: 8039.55447
+  tps: 4698.34349
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 8071.71066
-  tps: 4715.49097
+  dps: 8033.57293
+  tps: 4694.75456
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 8061.1881
-  tps: 4709.17743
+  dps: 8023.10524
+  tps: 4688.47395
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Thassarian'sBattlegear"
  value: {
-  dps: 7700.73804
-  tps: 4503.0337
+  dps: 7676.49191
+  tps: 4487.42532
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Thassarian'sPlate"
  value: {
-  dps: 6739.83854
-  tps: 3936.12163
+  dps: 6765.08372
+  tps: 3951.16157
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 7247.81346
-  tps: 4225.43073
+  dps: 7247.15869
+  tps: 4226.35971
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 8101.35501
-  tps: 4729.81022
+  dps: 8085.48228
+  tps: 4720.79597
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 7979.73062
-  tps: 4675.60791
+  dps: 7992.33409
+  tps: 4682.40307
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 8017.30124
-  tps: 4695.47214
+  dps: 8004.10117
+  tps: 4690.31226
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7819.46099
-  tps: 4574.01804
+  dps: 7840.12287
+  tps: 4587.13824
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 8046.15587
-  tps: 4700.1581
+  dps: 8008.1514
+  tps: 4679.50164
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6627.87386
-  tps: 3874.36281
+  dps: 6605.74458
+  tps: 3861.89148
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 7681.59804
-  tps: 4480.72267
+  dps: 7697.30322
+  tps: 4489.04848
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7813.91535
-  tps: 4574.99335
+  dps: 7778.59751
+  tps: 4555.35265
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-WrathfulGladiator'sSigilofStrife-51417"
  value: {
-  dps: 7712.29029
-  tps: 4499.83875
+  dps: 7668.8634
+  tps: 4475.92885
  }
 }
 dps_results: {
  key: "TestFrost-Average-Default"
  value: {
-  dps: 8213.79142
-  tps: 4801.56302
+  dps: 8197.70653
+  tps: 4792.88363
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Human-Frost P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 26045.2922
-  tps: 15508.50565
+  dps: 25552.38439
+  tps: 15210.9179
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Human-Frost P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 8191.99477
-  tps: 4794.12876
+  dps: 8189.58478
+  tps: 4794.0168
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Human-Frost P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9367.56466
-  tps: 5335.77136
+  dps: 9229.29643
+  tps: 5250.2122
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Human-Frost P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 13328.38034
-  tps: 7920.1855
+  dps: 13266.54195
+  tps: 7883.4389
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Human-Frost P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4882.46123
-  tps: 2851.34813
+  dps: 4876.40285
+  tps: 2847.16743
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Human-Frost P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5145.65155
-  tps: 2930.78185
+  dps: 5145.46739
+  tps: 2930.21501
  }
 }
 dps_results: {
@@ -988,43 +988,43 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Settings-Human-Frost P2-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 30102.15481
-  tps: 17924.35502
+  dps: 31048.9131
+  tps: 18493.06971
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Human-Frost P2-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 9970.29163
-  tps: 5844.69712
+  dps: 9942.6508
+  tps: 5827.66663
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Human-Frost P2-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 11512.35584
-  tps: 6587.45145
+  dps: 11322.27705
+  tps: 6472.76743
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Human-Frost P2-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 15941.56856
-  tps: 9479.08569
+  dps: 15749.13394
+  tps: 9363.76299
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Human-Frost P2-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 5994.39326
-  tps: 3508.32277
+  dps: 6026.02886
+  tps: 3527.876
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Human-Frost P2-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 6484.1384
-  tps: 3713.44612
+  dps: 6440.45602
+  tps: 3686.40436
  }
 }
 dps_results: {
@@ -1072,43 +1072,43 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Settings-Orc-Frost P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 25748.46413
-  tps: 15323.80907
+  dps: 25889.78228
+  tps: 15410.51082
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Orc-Frost P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 8251.62573
-  tps: 4823.44001
+  dps: 8210.75713
+  tps: 4801.06508
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Orc-Frost P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9403.82134
-  tps: 5343.67032
+  dps: 9279.16231
+  tps: 5265.85966
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Orc-Frost P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 13401.12667
-  tps: 7958.83003
+  dps: 13454.90984
+  tps: 7992.68005
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Orc-Frost P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4916.29479
-  tps: 2868.88791
+  dps: 4895.03498
+  tps: 2855.07402
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Orc-Frost P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5218.46646
-  tps: 2968.53942
+  dps: 5206.66763
+  tps: 2959.98429
  }
 }
 dps_results: {
@@ -1156,43 +1156,43 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Settings-Orc-Frost P2-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 30080.94403
-  tps: 17907.51093
+  dps: 31324.49673
+  tps: 18653.22845
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Orc-Frost P2-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 10013.04225
-  tps: 5863.41755
+  dps: 9992.47422
+  tps: 5850.69842
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Orc-Frost P2-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 11607.24501
-  tps: 6626.71922
+  dps: 11440.65068
+  tps: 6524.87677
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Orc-Frost P2-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 15841.3543
-  tps: 9415.691
+  dps: 15301.21073
+  tps: 9092.49301
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Orc-Frost P2-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 6039.3402
-  tps: 3531.94469
+  dps: 6019.96844
+  tps: 3519.19905
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Orc-Frost P2-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 6528.3911
-  tps: 3732.26504
+  dps: 6448.22863
+  tps: 3684.24386
  }
 }
 dps_results: {
@@ -1240,7 +1240,7 @@ dps_results: {
 dps_results: {
  key: "TestFrost-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7934.17513
-  tps: 4645.3503
+  dps: 7854.56671
+  tps: 4597.55063
  }
 }
diff --git a/sim/deathknight/dps/rotation_frost_sub_blood.go b/sim/deathknight/dps/rotation_frost_sub_blood.go
index 1ff5b2fea2..2c1cb07169 100644
--- a/sim/deathknight/dps/rotation_frost_sub_blood.go
+++ b/sim/deathknight/dps/rotation_frost_sub_blood.go
@@ -299,10 +299,11 @@ func (dk *DpsDeathknight) setupFrostSubBloodERWOpener() {
 	dk.RotationSequence.
 		NewAction(dk.RotationActionCallback_IT).
 		NewAction(dk.RotationActionCallback_PS).
+		NewAction(dk.RotationActionCallback_BS_Frost).
 		NewAction(dk.RotationActionCallback_UA_Frost).
 		NewAction(dk.RotationActionCallback_BT).
 		NewAction(dk.RotationActionCallback_FrostSubBlood_Obli).
-		NewAction(dk.RotationActionCallback_Frost_FS_HB).
+		//NewAction(dk.RotationActionCallback_Frost_FS_HB).
 		NewAction(dk.RotationActionCallback_Frost_Pesti_ERW).
 		NewAction(dk.RotationActionCallback_FrostSubBlood_Obli).
 		NewAction(dk.RotationActionCallback_Frost_FS_HB).
diff --git a/sim/hunter/TestAPL.results b/sim/hunter/TestAPL.results
index af13f1b651..a0abee07d9 100644
--- a/sim/hunter/TestAPL.results
+++ b/sim/hunter/TestAPL.results
@@ -820,8 +820,8 @@ dps_results: {
 dps_results: {
  key: "TestAPL-AllItems-Windrunner'sPursuit"
  value: {
-  dps: 6948.89297
-  tps: 5939.66399
+  dps: 6988.95976
+  tps: 5979.73077
  }
 }
 dps_results: {
diff --git a/sim/hunter/TestBM.results b/sim/hunter/TestBM.results
index ddd82ac075..b1cca88ab0 100644
--- a/sim/hunter/TestBM.results
+++ b/sim/hunter/TestBM.results
@@ -820,8 +820,8 @@ dps_results: {
 dps_results: {
  key: "TestBM-AllItems-Windrunner'sPursuit"
  value: {
-  dps: 6358.96515
-  tps: 4295.68176
+  dps: 6390.92028
+  tps: 4327.63689
  }
 }
 dps_results: {
diff --git a/sim/hunter/TestMM.results b/sim/hunter/TestMM.results
index ff58ca71fe..1e985515ac 100644
--- a/sim/hunter/TestMM.results
+++ b/sim/hunter/TestMM.results
@@ -820,8 +820,8 @@ dps_results: {
 dps_results: {
  key: "TestMM-AllItems-Windrunner'sPursuit"
  value: {
-  dps: 7143.8655
-  tps: 6222.68518
+  dps: 7185.07401
+  tps: 6263.89369
  }
 }
 dps_results: {
diff --git a/sim/hunter/TestSV.results b/sim/hunter/TestSV.results
index b3b7a32f6e..47f859a280 100644
--- a/sim/hunter/TestSV.results
+++ b/sim/hunter/TestSV.results
@@ -820,8 +820,8 @@ dps_results: {
 dps_results: {
  key: "TestSV-AllItems-Windrunner'sPursuit"
  value: {
-  dps: 7058.97004
-  tps: 6035.73395
+  dps: 7098.83075
+  tps: 6075.59466
  }
 }
 dps_results: {
diff --git a/sim/hunter/aimed_shot.go b/sim/hunter/aimed_shot.go
index cbe6283fbc..72f6f2f451 100644
--- a/sim/hunter/aimed_shot.go
+++ b/sim/hunter/aimed_shot.go
@@ -42,7 +42,7 @@ func (hunter *Hunter) registerAimedShotSpell(timer *core.Timer) {
 			.04*float64(hunter.Talents.Barrage),
 		DamageMultiplier: 1 *
 			hunter.markedForDeathMultiplier(),
-		CritMultiplier:   hunter.critMultiplier(true, true),
+		CritMultiplier:   hunter.critMultiplier(true, true, false),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
diff --git a/sim/hunter/arcane_shot.go b/sim/hunter/arcane_shot.go
index 48d3e81cb1..6b61d836b8 100644
--- a/sim/hunter/arcane_shot.go
+++ b/sim/hunter/arcane_shot.go
@@ -42,7 +42,7 @@ func (hunter *Hunter) registerArcaneShotSpell(timer *core.Timer) {
 			.05*float64(hunter.Talents.ImprovedArcaneShot),
 		DamageMultiplier: 1 *
 			hunter.markedForDeathMultiplier(),
-		CritMultiplier:   hunter.critMultiplier(true, true),
+		CritMultiplier:   hunter.critMultiplier(true, true, false),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
diff --git a/sim/hunter/chimera_shot.go b/sim/hunter/chimera_shot.go
index 1af575288a..7d1dfb9a3f 100644
--- a/sim/hunter/chimera_shot.go
+++ b/sim/hunter/chimera_shot.go
@@ -38,7 +38,7 @@ func (hunter *Hunter) registerChimeraShotSpell() {
 		},
 
 		DamageMultiplier: 1 * hunter.markedForDeathMultiplier(),
-		CritMultiplier:   hunter.critMultiplier(true, true),
+		CritMultiplier:   hunter.critMultiplier(true, true, false),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
@@ -75,7 +75,7 @@ func (hunter *Hunter) chimeraShotSerpentStingSpell() *core.Spell {
 		DamageMultiplier: 1 *
 			(2.0 + core.TernaryFloat64(hunter.HasMajorGlyph(proto.HunterMajorGlyph_GlyphOfSerpentSting), 0.8, 0)) *
 			hunter.markedForDeathMultiplier(),
-		CritMultiplier:   hunter.critMultiplier(true, false),
+		CritMultiplier:   hunter.critMultiplier(true, false, false),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
diff --git a/sim/hunter/explosive_shot.go b/sim/hunter/explosive_shot.go
index 0b0ed6c6c9..9534758942 100644
--- a/sim/hunter/explosive_shot.go
+++ b/sim/hunter/explosive_shot.go
@@ -54,7 +54,7 @@ func (hunter *Hunter) makeExplosiveShotSpell(timer *core.Timer, downrank bool) *
 		DamageMultiplierAdditive: 1 +
 			.02*float64(hunter.Talents.TNT),
 		DamageMultiplier: 1,
-		CritMultiplier:   hunter.critMultiplier(true, false),
+		CritMultiplier:   hunter.critMultiplier(true, false, false),
 		ThreatMultiplier: 1,
 
 		Dot: core.DotConfig{
diff --git a/sim/hunter/explosive_trap.go b/sim/hunter/explosive_trap.go
index 6bd101b36e..8c7e7a7835 100644
--- a/sim/hunter/explosive_trap.go
+++ b/sim/hunter/explosive_trap.go
@@ -32,7 +32,7 @@ func (hunter *Hunter) registerExplosiveTrapSpell(timer *core.Timer) {
 
 		DamageMultiplierAdditive: 1 +
 			.02*float64(hunter.Talents.TNT),
-		CritMultiplier:   hunter.critMultiplier(false, false),
+		CritMultiplier:   hunter.critMultiplier(false, false, false),
 		ThreatMultiplier: 1,
 
 		Dot: core.DotConfig{
diff --git a/sim/hunter/hunter.go b/sim/hunter/hunter.go
index 2f87838057..2a800b6c80 100644
--- a/sim/hunter/hunter.go
+++ b/sim/hunter/hunter.go
@@ -115,9 +115,9 @@ func (hunter *Hunter) AddPartyBuffs(partyBuffs *proto.PartyBuffs) {
 
 func (hunter *Hunter) Initialize() {
 	// Update auto crit multipliers now that we have the targets.
-	hunter.AutoAttacks.MHConfig.CritMultiplier = hunter.critMultiplier(false, false)
-	hunter.AutoAttacks.OHConfig.CritMultiplier = hunter.critMultiplier(false, false)
-	hunter.AutoAttacks.RangedConfig.CritMultiplier = hunter.critMultiplier(false, false)
+	hunter.AutoAttacks.MHConfig.CritMultiplier = hunter.critMultiplier(false, false, false)
+	hunter.AutoAttacks.OHConfig.CritMultiplier = hunter.critMultiplier(false, false, false)
+	hunter.AutoAttacks.RangedConfig.CritMultiplier = hunter.critMultiplier(false, false, false)
 
 	hunter.registerAspectOfTheDragonhawkSpell()
 	hunter.registerAspectOfTheViperSpell()
diff --git a/sim/hunter/kill_shot.go b/sim/hunter/kill_shot.go
index 06091e5e37..453a60e2f3 100644
--- a/sim/hunter/kill_shot.go
+++ b/sim/hunter/kill_shot.go
@@ -36,7 +36,7 @@ func (hunter *Hunter) registerKillShotSpell() {
 			5*core.CritRatingPerCritChance*float64(hunter.Talents.SniperTraining),
 		DamageMultiplier: 1 *
 			hunter.markedForDeathMultiplier(),
-		CritMultiplier:   hunter.critMultiplier(true, true),
+		CritMultiplier:   hunter.critMultiplier(true, true, false),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
diff --git a/sim/hunter/multi_shot.go b/sim/hunter/multi_shot.go
index 762946b69f..a2732f635c 100644
--- a/sim/hunter/multi_shot.go
+++ b/sim/hunter/multi_shot.go
@@ -41,7 +41,7 @@ func (hunter *Hunter) registerMultiShotSpell(timer *core.Timer) {
 			.04*float64(hunter.Talents.Barrage),
 		DamageMultiplier: 1 *
 			hunter.markedForDeathMultiplier(),
-		CritMultiplier:   hunter.critMultiplier(true, false),
+		CritMultiplier:   hunter.critMultiplier(true, false, false),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
diff --git a/sim/hunter/raptor_strike.go b/sim/hunter/raptor_strike.go
index 9fe2149ea2..08b80171de 100644
--- a/sim/hunter/raptor_strike.go
+++ b/sim/hunter/raptor_strike.go
@@ -27,7 +27,7 @@ func (hunter *Hunter) registerRaptorStrikeSpell() {
 
 		BonusCritRating:  float64(hunter.Talents.SavageStrikes) * 10 * core.CritRatingPerCritChance,
 		DamageMultiplier: 1,
-		CritMultiplier:   hunter.critMultiplier(false, false),
+		CritMultiplier:   hunter.critMultiplier(false, false, false),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
diff --git a/sim/hunter/serpent_sting.go b/sim/hunter/serpent_sting.go
index 7b406a910a..b4246e0845 100644
--- a/sim/hunter/serpent_sting.go
+++ b/sim/hunter/serpent_sting.go
@@ -35,7 +35,9 @@ func (hunter *Hunter) registerSerpentStingSpell() {
 		DamageMultiplierAdditive: 1 +
 			0.1*float64(hunter.Talents.ImprovedStings) +
 			core.TernaryFloat64(hunter.HasSetBonus(ItemSetScourgestalkerBattlegear, 2), .1, 0),
-		CritMultiplier:   hunter.critMultiplier(true, false),
+		// according to in-game testing (which happens to match the wowhead 60% mortal shots flag on wowhead)
+		// serpent-sting gets 60% crit modifier instead of 30% crit modifier from mortal shots
+		CritMultiplier:   hunter.critMultiplier(true, false, true),
 		ThreatMultiplier: 1,
 
 		Dot: core.DotConfig{
diff --git a/sim/hunter/silencing_shot.go b/sim/hunter/silencing_shot.go
index e303c15502..e3e5af3f83 100644
--- a/sim/hunter/silencing_shot.go
+++ b/sim/hunter/silencing_shot.go
@@ -30,7 +30,7 @@ func (hunter *Hunter) registerSilencingShotSpell() {
 
 		DamageMultiplier: 0.5 *
 			hunter.markedForDeathMultiplier(),
-		CritMultiplier:   hunter.critMultiplier(true, false),
+		CritMultiplier:   hunter.critMultiplier(true, false, false),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
diff --git a/sim/hunter/steady_shot.go b/sim/hunter/steady_shot.go
index b64b3247ca..9f837e3136 100644
--- a/sim/hunter/steady_shot.go
+++ b/sim/hunter/steady_shot.go
@@ -75,7 +75,7 @@ func (hunter *Hunter) registerSteadyShotSpell() {
 			core.TernaryFloat64(hunter.HasSetBonus(ItemSetGronnstalker, 4), .1, 0),
 		DamageMultiplier: 1 *
 			hunter.markedForDeathMultiplier(),
-		CritMultiplier:   hunter.critMultiplier(true, true),
+		CritMultiplier:   hunter.critMultiplier(true, true, false),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
diff --git a/sim/hunter/talents.go b/sim/hunter/talents.go
index 6f679595ca..efb4c8be7b 100644
--- a/sim/hunter/talents.go
+++ b/sim/hunter/talents.go
@@ -117,12 +117,17 @@ func (hunter *Hunter) ApplyTalents() {
 	hunter.registerReadinessCD()
 }
 
-func (hunter *Hunter) critMultiplier(isRanged bool, isMFDSpell bool) float64 {
+func (hunter *Hunter) critMultiplier(isRanged bool, isMFDSpell bool, doubleDipMS bool) float64 {
 	primaryModifier := 1.0
 	secondaryModifier := 0.0
+	mortalShotsFactor := 0.06
+
+	if doubleDipMS {
+		mortalShotsFactor = 0.12
+	}
 
 	if isRanged {
-		secondaryModifier += 0.06 * float64(hunter.Talents.MortalShots)
+		secondaryModifier += mortalShotsFactor * float64(hunter.Talents.MortalShots)
 		if isMFDSpell {
 			secondaryModifier += 0.02 * float64(hunter.Talents.MarkedForDeath)
 		}
@@ -321,7 +326,7 @@ func (hunter *Hunter) applyWildQuiver() {
 		Flags:       core.SpellFlagNoOnCastComplete,
 
 		DamageMultiplier: 0.8,
-		CritMultiplier:   hunter.critMultiplier(false, false),
+		CritMultiplier:   hunter.critMultiplier(false, false, false),
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
diff --git a/sim/hunter/volley.go b/sim/hunter/volley.go
index d2b9c1af3a..1ddf3165ac 100644
--- a/sim/hunter/volley.go
+++ b/sim/hunter/volley.go
@@ -27,7 +27,7 @@ func (hunter *Hunter) registerVolleySpell() {
 
 		DamageMultiplier: 1 *
 			(1 + 0.04*float64(hunter.Talents.Barrage)),
-		CritMultiplier:   hunter.critMultiplier(true, false),
+		CritMultiplier:   hunter.critMultiplier(true, false, false),
 		ThreatMultiplier: 1,
 
 		Dot: core.DotConfig{