diff --git a/sim/priest/shadow/TestShadow.results b/sim/priest/shadow/TestShadow.results
index 72db472b81..0920f62ed6 100644
--- a/sim/priest/shadow/TestShadow.results
+++ b/sim/priest/shadow/TestShadow.results
@@ -46,1130 +46,1130 @@ character_stats_results: {
 dps_results: {
  key: "TestShadow-AllItems-AbsolutionRegalia"
  value: {
-  dps: 5535.43082
-  tps: 5319.55999
+  dps: 5515.49364
+  tps: 5300.63783
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 7498.71769
-  tps: 7388.34703
+  dps: 7508.02919
+  tps: 7396.86103
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 7533.20273
-  tps: 7421.82018
+  dps: 7551.96849
+  tps: 7441.96884
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-AshtongueTalismanofAcumen-32490"
  value: {
-  dps: 7312.47991
-  tps: 7207.08613
+  dps: 7321.20418
+  tps: 7216.60379
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 7340.05263
-  tps: 7229.43807
+  dps: 7350.81672
+  tps: 7238.91569
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 7196.30379
-  tps: 7093.49744
-  hps: 88.62456
+  dps: 7204.08603
+  tps: 7100.98963
+  hps: 89.02318
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 7196.30379
-  tps: 7093.49744
-  hps: 88.62456
+  dps: 7204.08603
+  tps: 7100.98963
+  hps: 89.02318
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 7361.79006
-  tps: 7252.29379
+  dps: 7360.62939
+  tps: 7250.24503
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 6215.80385
-  tps: 6017.49234
+  dps: 6246.11043
+  tps: 6046.31424
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 7379.12562
-  tps: 7123.33444
+  dps: 7391.87838
+  tps: 7134.60042
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 7521.96784
-  tps: 7410.63037
+  dps: 7540.72876
+  tps: 7430.77393
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
   hps: 64
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-CrimsonAcolyte'sRaiment"
  value: {
-  dps: 7045.88322
-  tps: 6926.86835
+  dps: 7067.80542
+  tps: 6947.11985
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-CrimsonAcolyte'sRegalia"
  value: {
-  dps: 8109.14904
-  tps: 8003.05849
+  dps: 8115.87762
+  tps: 8009.68504
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7297.18601
-  tps: 7194.78955
+  dps: 7318.02044
+  tps: 7214.29846
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7350.74411
-  tps: 7249.32558
+  dps: 7360.71009
+  tps: 7258.18511
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 7279.12091
-  tps: 7168.94308
+  dps: 7290.91901
+  tps: 7182.04652
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Death'sChoice-47464"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7220.49396
-  tps: 7117.91147
+  dps: 7234.40731
+  tps: 7131.21873
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 7373.78801
-  tps: 7262.88422
+  dps: 7379.43107
+  tps: 7267.33415
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 7938.80117
-  tps: 7835.78799
+  dps: 7927.2287
+  tps: 7823.94138
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 7859.69699
-  tps: 7751.74485
+  dps: 7845.86465
+  tps: 7737.59032
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 7340.05263
-  tps: 7229.43807
+  dps: 7350.81672
+  tps: 7238.91569
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 7387.81081
-  tps: 7277.19263
+  dps: 7388.01678
+  tps: 7276.87006
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 7371.6339
-  tps: 7260.72027
+  dps: 7378.12484
+  tps: 7266.00972
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 7361.38711
-  tps: 7250.7436
+  dps: 7368.28256
+  tps: 7256.40615
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7362.43364
-  tps: 7262.13899
+  dps: 7339.07272
+  tps: 7241.44711
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 7340.05263
-  tps: 7229.43807
+  dps: 7350.81672
+  tps: 7238.91569
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7372.99342
-  tps: 7272.45892
+  dps: 7379.87746
+  tps: 7277.362
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7508.81181
-  tps: 7400.7634
+  dps: 7531.65843
+  tps: 7422.64111
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 7212.68934
-  tps: 7105.739
+  dps: 7216.28185
+  tps: 7113.61164
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 7381.19286
-  tps: 7273.7023
+  dps: 7392.6647
+  tps: 7284.56291
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7451.87464
-  tps: 7347.1269
+  dps: 7450.30352
+  tps: 7345.80495
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 7379.12562
-  tps: 7267.40486
+  dps: 7391.87838
+  tps: 7278.89618
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 7370.85429
-  tps: 7259.35863
+  dps: 7383.59795
+  tps: 7270.841
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7308.83904
-  tps: 7201.43752
+  dps: 7329.7708
+  tps: 7221.7553
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-GarbofFaith"
  value: {
-  dps: 6613.14479
-  tps: 6506.62337
+  dps: 6617.47769
+  tps: 6512.07896
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Gladiator'sInvestiture"
  value: {
-  dps: 6985.16397
-  tps: 6851.44776
+  dps: 6977.7672
+  tps: 6842.0231
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Gladiator'sRaiment"
  value: {
-  dps: 7144.0078
-  tps: 7014.90978
+  dps: 7113.79585
+  tps: 6984.19837
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 7517.77235
-  tps: 7406.87931
+  dps: 7527.27512
+  tps: 7415.78557
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 7557.48926
-  tps: 7445.9319
+  dps: 7564.50278
+  tps: 7453.46517
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 7331.7787
-  tps: 7229.48168
+  dps: 7334.24312
+  tps: 7230.46654
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Heartpierce-49982"
  value: {
-  dps: 7521.96784
-  tps: 7410.63037
+  dps: 7540.72876
+  tps: 7430.77393
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Heartpierce-50641"
  value: {
-  dps: 7521.96784
-  tps: 7410.63037
+  dps: 7540.72876
+  tps: 7430.77393
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 7371.6339
-  tps: 7260.72027
+  dps: 7378.12484
+  tps: 7266.00972
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 7361.38711
-  tps: 7250.7436
+  dps: 7368.28256
+  tps: 7256.40615
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-IncisorFragment-37723"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 7353.94638
-  tps: 7242.35681
+  dps: 7365.71233
+  tps: 7256.38394
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 7340.05263
-  tps: 7229.43807
+  dps: 7350.81672
+  tps: 7238.91569
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7258.49191
-  tps: 7145.22717
+  dps: 7279.11059
+  tps: 7167.46837
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 7272.09228
-  tps: 7169.86796
+  dps: 7291.24543
+  tps: 7188.07622
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7487.45533
-  tps: 7380.72113
+  dps: 7496.76913
+  tps: 7390.0905
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 7340.05263
-  tps: 7229.43807
+  dps: 7350.81672
+  tps: 7238.91569
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 7340.05263
-  tps: 7229.43807
+  dps: 7350.81672
+  tps: 7238.91569
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 7340.05263
-  tps: 7229.43807
+  dps: 7350.81672
+  tps: 7238.91569
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 7340.05263
-  tps: 7229.43807
+  dps: 7350.81672
+  tps: 7238.91569
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-RegaliaofFaith"
  value: {
-  dps: 6363.39067
-  tps: 6243.33862
+  dps: 6327.63485
+  tps: 6215.9932
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7593.38429
-  tps: 7484.73298
+  dps: 7617.41933
+  tps: 7506.88586
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7648.46814
-  tps: 7538.81173
+  dps: 7667.47371
+  tps: 7556.12985
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 7488.89447
-  tps: 7378.28634
+  dps: 7513.01158
+  tps: 7403.01284
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 7335.93317
-  tps: 7226.93669
+  dps: 7339.49782
+  tps: 7229.75937
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-SanctificationGarb"
  value: {
-  dps: 7346.03368
-  tps: 7229.31174
+  dps: 7334.36679
+  tps: 7220.00836
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-SanctificationRegalia"
  value: {
-  dps: 6767.51597
-  tps: 6650.44011
+  dps: 6764.64915
+  tps: 6653.04699
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 7468.26976
-  tps: 7359.2808
+  dps: 7478.61852
+  tps: 7370.93469
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 7507.10866
-  tps: 7396.42154
+  dps: 7502.9846
+  tps: 7394.92744
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-SoulPreserver-37111"
  value: {
-  dps: 7320.13813
-  tps: 7214.26971
+  dps: 7330.7721
+  tps: 7224.29368
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-SouloftheDead-40382"
  value: {
-  dps: 7312.0025
-  tps: 7211.13667
+  dps: 7313.26429
+  tps: 7214.35672
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-SparkofLife-37657"
  value: {
-  dps: 7319.99638
-  tps: 7212.06805
+  dps: 7298.36066
+  tps: 7188.83919
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 7209.35456
-  tps: 7107.41471
+  dps: 7206.34807
+  tps: 7105.02092
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 7340.05263
-  tps: 7229.43807
+  dps: 7350.81672
+  tps: 7238.91569
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 7340.05263
-  tps: 7229.43807
+  dps: 7350.81672
+  tps: 7238.91569
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 7340.05263
-  tps: 7229.43807
+  dps: 7350.81672
+  tps: 7238.91569
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 7251.61014
-  tps: 7147.52846
+  dps: 7273.59655
+  tps: 7168.66987
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 7225.00957
-  tps: 7119.4669
+  dps: 7238.41
+  tps: 7134.53233
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 7195.32027
-  tps: 7092.51391
+  dps: 7203.56221
+  tps: 7100.4658
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 7340.05263
-  tps: 7229.43807
+  dps: 7350.81672
+  tps: 7238.91569
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 7205.17146
-  tps: 7103.87711
+  dps: 7196.32495
+  tps: 7094.43858
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 7205.17146
-  tps: 7103.87711
+  dps: 7196.32495
+  tps: 7094.43858
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 7379.12562
-  tps: 7267.40486
+  dps: 7391.87838
+  tps: 7278.89618
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 7370.85429
-  tps: 7259.35863
+  dps: 7383.59795
+  tps: 7270.841
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7396.71591
-  tps: 7292.03909
+  dps: 7392.34584
+  tps: 7286.22472
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 7370.85429
-  tps: 7259.35863
+  dps: 7383.59795
+  tps: 7270.841
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 7379.12562
-  tps: 7267.40486
+  dps: 7391.87838
+  tps: 7278.89618
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 7790.8077
-  tps: 7674.42083
+  dps: 7803.29816
+  tps: 7686.25377
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-VestmentsofAbsolution"
  value: {
-  dps: 5350.54629
-  tps: 5132.01418
+  dps: 5341.85221
+  tps: 5118.95687
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7318.91309
-  tps: 7215.79501
+  dps: 7307.27371
+  tps: 7203.31219
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Zabra'sRaiment"
  value: {
-  dps: 6713.62447
-  tps: 6594.6255
+  dps: 6706.69269
+  tps: 6591.31793
  }
 }
 dps_results: {
  key: "TestShadow-AllItems-Zabra'sRegalia"
  value: {
-  dps: 7097.06323
-  tps: 6983.53883
+  dps: 7097.73571
+  tps: 6986.96333
  }
 }
 dps_results: {
  key: "TestShadow-Average-Default"
  value: {
-  dps: 7566.75538
-  tps: 7452.86977
+  dps: 7578.82886
+  tps: 7465.30265
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 7480.0083
-  tps: 8575.40764
+  dps: 7470.18901
+  tps: 8565.29581
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7480.0083
-  tps: 7370.69942
+  dps: 7470.18901
+  tps: 7361.03665
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8032.93779
-  tps: 8120.86511
+  dps: 8025.10033
+  tps: 8113.02765
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3720.60084
-  tps: 4614.89922
+  dps: 3712.91185
+  tps: 4599.30214
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3720.60084
-  tps: 3598.99928
+  dps: 3712.91185
+  tps: 3590.49051
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4239.66174
-  tps: 3896.56061
+  dps: 4231.53201
+  tps: 3888.47432
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Clipping-FullBuffs-LongMultiTarget"
  value: {
-  dps: 7096.86733
-  tps: 8138.03251
+  dps: 7087.52574
+  tps: 8129.31968
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Clipping-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7096.86733
-  tps: 6976.13581
+  dps: 7087.52574
+  tps: 6966.66924
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Clipping-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7808.29027
-  tps: 7899.41748
+  dps: 7800.39501
+  tps: 7891.52223
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Clipping-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3502.07749
-  tps: 4456.51733
+  dps: 3485.94307
+  tps: 4435.13382
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Clipping-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3502.07749
-  tps: 3381.3011
+  dps: 3485.94307
+  tps: 3363.75877
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Clipping-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4113.09776
-  tps: 3775.16766
+  dps: 4097.84222
+  tps: 3759.80054
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Ideal-FullBuffs-LongMultiTarget"
  value: {
-  dps: 7501.38249
-  tps: 8600.51931
+  dps: 7514.4473
+  tps: 8617.60451
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Ideal-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7501.38249
-  tps: 7387.13599
+  dps: 7514.4473
+  tps: 7399.68447
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Ideal-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8229.1413
-  tps: 8327.63119
+  dps: 8209.78991
+  tps: 8307.27306
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Ideal-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3649.45503
-  tps: 4641.56315
+  dps: 3653.0278
+  tps: 4613.92856
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Ideal-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3649.45503
-  tps: 3530.59444
+  dps: 3653.0278
+  tps: 3532.65938
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Draenei-P1-Ideal-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4359.43399
-  tps: 4019.77542
+  dps: 4344.16345
+  tps: 4003.60604
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 7458.73009
-  tps: 8553.18414
+  dps: 7447.95488
+  tps: 8541.93496
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7458.73009
-  tps: 7349.21291
+  dps: 7447.95488
+  tps: 7338.58464
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8034.87286
-  tps: 8122.76719
+  dps: 8027.03746
+  tps: 8114.93179
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3677.19247
-  tps: 4563.71362
+  dps: 3673.5674
+  tps: 4551.67027
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3677.19247
-  tps: 3552.44296
+  dps: 3673.5674
+  tps: 3547.48078
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4231.57368
-  tps: 3888.42352
+  dps: 4223.4473
+  tps: 3880.34049
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Clipping-FullBuffs-LongMultiTarget"
  value: {
-  dps: 7073.90401
-  tps: 8110.5708
+  dps: 7062.45245
+  tps: 8102.37356
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Clipping-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7073.90401
-  tps: 6953.30774
+  dps: 7062.45245
+  tps: 6942.14625
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Clipping-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7804.78226
-  tps: 7895.81209
+  dps: 7796.88928
+  tps: 7887.91911
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Clipping-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3517.28877
-  tps: 4479.82716
+  dps: 3501.2434
+  tps: 4463.85377
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Clipping-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3517.28877
-  tps: 3397.4553
+  dps: 3501.2434
+  tps: 3381.9643
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Clipping-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4105.74375
-  tps: 3768.09918
+  dps: 4090.49949
+  tps: 3752.74376
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Ideal-FullBuffs-LongMultiTarget"
  value: {
-  dps: 7476.95325
-  tps: 8572.87277
+  dps: 7488.33626
+  tps: 8587.22504
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Ideal-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7476.95325
-  tps: 7363.59311
+  dps: 7488.33626
+  tps: 7373.70857
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Ideal-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8218.45804
-  tps: 8316.91493
+  dps: 8199.11073
+  tps: 8296.56088
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Ideal-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3630.41511
-  tps: 4632.18608
+  dps: 3633.92937
+  tps: 4620.47856
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Ideal-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3630.41511
-  tps: 3511.20605
+  dps: 3633.92937
+  tps: 3514.05205
  }
 }
 dps_results: {
  key: "TestShadow-Settings-NightElf-P1-Ideal-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4352.38169
-  tps: 4012.00572
+  dps: 4339.97845
+  tps: 3999.03446
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 7506.08661
-  tps: 8609.19631
+  dps: 7496.54214
+  tps: 8597.07934
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7506.08661
-  tps: 7395.87012
+  dps: 7496.54214
+  tps: 7385.83804
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8080.37259
-  tps: 8164.98409
+  dps: 8072.50116
+  tps: 8157.11265
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3796.17539
-  tps: 4703.76152
+  dps: 3784.76748
+  tps: 4691.6749
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3796.17539
-  tps: 3673.73256
+  dps: 3784.76748
+  tps: 3662.0463
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4232.33651
-  tps: 3910.70516
+  dps: 4224.15139
+  tps: 3902.56442
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Clipping-FullBuffs-LongMultiTarget"
  value: {
-  dps: 7095.19457
-  tps: 8143.30914
+  dps: 7083.28803
+  tps: 8131.21907
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Clipping-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7095.19457
-  tps: 6980.21983
+  dps: 7083.28803
+  tps: 6968.23938
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Clipping-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7843.02142
-  tps: 7932.72505
+  dps: 7835.0886
+  tps: 7924.79223
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Clipping-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3563.91517
-  tps: 4473.4039
+  dps: 3570.16177
+  tps: 4487.11431
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Clipping-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3563.91517
-  tps: 3439.8407
+  dps: 3570.16177
+  tps: 3446.79759
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Clipping-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4128.37784
-  tps: 3786.66087
+  dps: 4112.6665
+  tps: 3770.77812
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Ideal-FullBuffs-LongMultiTarget"
  value: {
-  dps: 7521.96784
-  tps: 8622.41198
+  dps: 7540.72876
+  tps: 8647.86364
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Ideal-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7521.96784
-  tps: 7410.63037
+  dps: 7540.72876
+  tps: 7430.77393
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Ideal-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8266.09598
-  tps: 8362.27856
+  dps: 8246.71836
+  tps: 8341.8942
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Ideal-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3749.68804
-  tps: 4719.82254
+  dps: 3752.09667
+  tps: 4682.88386
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Ideal-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3749.68804
-  tps: 3629.3947
+  dps: 3752.09667
+  tps: 3630.1707
  }
 }
 dps_results: {
  key: "TestShadow-Settings-Undead-P1-Ideal-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4369.48981
-  tps: 4024.49506
+  dps: 4350.48181
+  tps: 4006.24595
  }
 }
 dps_results: {
  key: "TestShadow-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7495.70916
-  tps: 7410.63037
+  dps: 7514.50641
+  tps: 7430.77393
  }
 }
diff --git a/sim/priest/shadow_word_death.go b/sim/priest/shadow_word_death.go
index 9dc0c8cb77..effc85011d 100644
--- a/sim/priest/shadow_word_death.go
+++ b/sim/priest/shadow_word_death.go
@@ -39,10 +39,8 @@ func (priest *Priest) registerShadowWordDeathSpell() {
 			},
 		},
 
-		BonusHitRating: float64(priest.Talents.ShadowFocus) * 1 * core.SpellHitRatingPerHitChance,
-		BonusCritRating: 0 +
-			float64(priest.Talents.MindMelt)*2*core.CritRatingPerCritChance +
-			core.TernaryFloat64(priest.HasSetBonus(ItemSetValorous, 4), 10, 0)*core.CritRatingPerCritChance, // might be 0.1?
+		BonusHitRating:  float64(priest.Talents.ShadowFocus) * 1 * core.SpellHitRatingPerHitChance,
+		BonusCritRating: 0 + core.TernaryFloat64(priest.HasSetBonus(ItemSetValorous, 4), 10, 0)*core.CritRatingPerCritChance, // might be 0.1?
 		DamageMultiplier: 1 +
 			0.02*float64(priest.Talents.Darkness) +
 			0.01*float64(priest.Talents.TwinDisciplines),