diff --git a/sim/deathknight/blood_strike.go b/sim/deathknight/blood_strike.go
index f74eaf944a..e13db4f2f1 100644
--- a/sim/deathknight/blood_strike.go
+++ b/sim/deathknight/blood_strike.go
@@ -106,10 +106,7 @@ func (dk *Deathknight) registerDrwBloodStrikeSpell() {
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			baseDamage := 764 +
-				bonusBaseDamage +
-				spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower()) +
-				spell.BonusWeaponDamage()
+			baseDamage := 764 + bonusBaseDamage + dk.DrwWeaponDamage(sim, spell)
 
 			baseDamage *= dk.RoRTSBonus(target) *
 				(1.0 + dk.drwCountActiveDiseases(target)*diseaseMulti)
diff --git a/sim/deathknight/dancing_rune_weapon.go b/sim/deathknight/dancing_rune_weapon.go
index 00862e9e5c..914edc4d2a 100644
--- a/sim/deathknight/dancing_rune_weapon.go
+++ b/sim/deathknight/dancing_rune_weapon.go
@@ -109,6 +109,16 @@ func (runeWeapon *RuneWeaponPet) Initialize() {
 	runeWeapon.dkOwner.registerDrwDeathCoilSpell()
 }
 
+func (dk *Deathknight) DrwWeaponDamage(sim *core.Simulation, spell *core.Spell) float64 {
+	if dk.Inputs.NewDrw {
+		return spell.Unit.MHWeaponDamage(sim, spell.MeleeAttackPower()) +
+			spell.BonusWeaponDamage()
+	} else {
+		return spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower()) +
+			spell.BonusWeaponDamage()
+	}
+}
+
 func (dk *Deathknight) NewRuneWeapon() *RuneWeaponPet {
 	// Remove any hit that would be given by NocS as it does not translate to pets
 	nocsHit := 0.0
diff --git a/sim/deathknight/death_strike.go b/sim/deathknight/death_strike.go
index 15ac296430..b59cee7865 100644
--- a/sim/deathknight/death_strike.go
+++ b/sim/deathknight/death_strike.go
@@ -97,6 +97,7 @@ func (dk *Deathknight) registerDeathStrikeSpell() {
 
 func (dk *Deathknight) registerDrwDeathStrikeSpell() {
 	bonusBaseDamage := dk.sigilOfAwarenessBonus()
+	hasGlyph := dk.HasMajorGlyph(proto.DeathknightMajorGlyph_GlyphOfDeathStrike)
 
 	dk.RuneWeapon.DeathStrike = dk.RuneWeapon.RegisterSpell(core.SpellConfig{
 		ActionID:    DeathStrikeActionID.WithTag(1),
@@ -110,11 +111,11 @@ func (dk *Deathknight) registerDrwDeathStrikeSpell() {
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			baseDamage := 297 +
-				bonusBaseDamage +
-				spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower()) +
-				spell.BonusWeaponDamage()
+			baseDamage := 297 + bonusBaseDamage + dk.DrwWeaponDamage(sim, spell)
 
+			if hasGlyph {
+				baseDamage *= 1 + 0.01*core.MinFloat(dk.CurrentRunicPower(), 25)
+			}
 			spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMeleeWeaponSpecialHitAndCrit)
 		},
 	})
diff --git a/sim/deathknight/dps/TestBlood.results b/sim/deathknight/dps/TestBlood.results
index 842ca1b7c3..ee7c116583 100644
--- a/sim/deathknight/dps/TestBlood.results
+++ b/sim/deathknight/dps/TestBlood.results
@@ -46,35 +46,35 @@ character_stats_results: {
 dps_results: {
  key: "TestBlood-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 7157.12096
+  dps: 7167.35777
   tps: 3608.06795
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 7053.58866
+  dps: 7063.56862
   tps: 3587.88008
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 6869.50557
+  dps: 6879.24838
   tps: 3485.56722
   hps: 61.26936
  }
@@ -82,7 +82,7 @@ dps_results: {
 dps_results: {
  key: "TestBlood-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 6869.50557
+  dps: 6879.24838
   tps: 3485.56722
   hps: 61.26936
  }
@@ -90,84 +90,84 @@ dps_results: {
 dps_results: {
  key: "TestBlood-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 7175.92879
+  dps: 7186.22516
   tps: 3617.96788
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 7001.16978
+  dps: 7011.66476
   tps: 3537.32788
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 5993.7485
+  dps: 6002.75269
   tps: 3028.91289
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 5907.76802
+  dps: 5917.56134
   tps: 3000.68671
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5689.39326
+  dps: 5698.14803
   tps: 2885.56875
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3533.32236
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 8598.92565
+  dps: 8611.26346
   tps: 4418.97839
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 8656.92741
+  dps: 8669.12135
   tps: 4455.39951
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 7294.7194
+  dps: 7305.25213
   tps: 3683.06917
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
   hps: 42.66667
  }
@@ -175,287 +175,287 @@ dps_results: {
 dps_results: {
  key: "TestBlood-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 6984.27453
+  dps: 6994.33991
   tps: 3545.19613
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7026.99879
+  dps: 7037.07413
   tps: 3577.70274
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 7114.84076
+  dps: 7125.17256
   tps: 3591.98944
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DarkrunedBattlegear"
  value: {
-  dps: 6956.23129
+  dps: 6967.29135
   tps: 3528.64053
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DarkrunedPlate"
  value: {
-  dps: 6073.6222
+  dps: 6082.48218
   tps: 3065.4025
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DeadlyGladiator'sSigilofStrife-42620"
  value: {
-  dps: 7193.71142
+  dps: 7202.95686
   tps: 3624.5945
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Death'sChoice-47464"
  value: {
-  dps: 7484.11687
+  dps: 7495.10703
   tps: 3770.95274
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 6952.48396
+  dps: 6962.42592
   tps: 3529.24644
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 7328.15807
+  dps: 7338.19517
   tps: 3749.54945
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 7394.67638
+  dps: 7404.48025
   tps: 3777.9765
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Defender'sCode-40257"
  value: {
-  dps: 6885.61775
+  dps: 6895.37976
   tps: 3494.06131
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 7179.74564
+  dps: 7190.042
   tps: 3619.76768
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 7065.93773
+  dps: 7076.06806
   tps: 3579.95356
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 7016.1252
+  dps: 7025.5231
   tps: 3549.32882
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 7175.92879
+  dps: 7186.22516
   tps: 3617.96788
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 7173.20491
+  dps: 7183.50128
   tps: 3616.72551
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 6964.62361
+  dps: 6975.37826
   tps: 3511.72075
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7016.83767
+  dps: 7026.6645
   tps: 3566.00154
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6968.08899
+  dps: 6978.15436
   tps: 3536.33257
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6948.83841
+  dps: 6958.71465
   tps: 3527.4644
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-FuriousGladiator'sSigilofStrife-42621"
  value: {
-  dps: 7195.16072
+  dps: 7204.41195
   tps: 3625.14654
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 7076.47027
+  dps: 7086.44464
   tps: 3596.66755
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 6974.62191
+  dps: 6984.44375
   tps: 3545.305
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-HatefulGladiator'sSigilofStrife-42619"
  value: {
-  dps: 7188.89761
+  dps: 7198.11669
   tps: 3623.10408
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 7175.92879
+  dps: 7186.22516
   tps: 3617.96788
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 7173.20491
+  dps: 7183.50128
   tps: 3616.72551
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-IncisorFragment-37723"
  value: {
-  dps: 7036.68254
+  dps: 7046.54571
   tps: 3578.51945
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 7181.00137
+  dps: 7191.26544
   tps: 3620.41793
   hps: 12.48865
  }
@@ -463,532 +463,532 @@ dps_results: {
 dps_results: {
  key: "TestBlood-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 6984.47965
+  dps: 6994.18534
   tps: 3544.81619
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7051.85253
+  dps: 7062.25997
   tps: 3569.23398
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 6879.93015
+  dps: 6889.68539
   tps: 3491.06283
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 7174.89926
+  dps: 7185.15701
   tps: 3617.43413
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 7180.26011
+  dps: 7190.52418
   tps: 3620.2584
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 6912.76653
+  dps: 6922.56088
   tps: 3508.37407
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 6918.34037
+  dps: 6928.14137
   tps: 3511.31258
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6943.94871
+  dps: 6953.63687
   tps: 3530.74808
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6951.28703
+  dps: 6960.97519
   tps: 3535.15107
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 7290.41884
+  dps: 7300.95261
   tps: 3680.99074
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-RelentlessGladiator'sSigilofStrife-42622"
  value: {
-  dps: 7196.85156
+  dps: 7206.10956
   tps: 3625.79058
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SavageGladiator'sSigilofStrife-42618"
  value: {
-  dps: 7188.62221
+  dps: 7197.841
   tps: 3622.96033
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ScourgeborneBattlegear"
  value: {
-  dps: 6609.5528
+  dps: 6619.84244
   tps: 3338.58564
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ScourgebornePlate"
  value: {
-  dps: 6076.83121
+  dps: 6086.36319
   tps: 3069.62042
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Scourgelord'sBattlegear"
  value: {
-  dps: 7568.03918
+  dps: 7578.63437
   tps: 3883.48334
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Scourgelord'sPlate"
  value: {
-  dps: 6393.8999
+  dps: 6402.98367
   tps: 3228.31644
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 6880.84529
+  dps: 6890.60959
   tps: 3491.07819
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Shadowmourne-49623"
  value: {
-  dps: 9554.8012
+  dps: 9566.53335
   tps: 4941.38985
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SigilofDeflection-45144"
  value: {
-  dps: 7186.46493
+  dps: 7195.68141
   tps: 3621.8343
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SigilofHauntedDreams-40715"
  value: {
-  dps: 7217.91397
+  dps: 7227.13045
   tps: 3638.53175
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SigilofInsolence-47672"
  value: {
-  dps: 7186.46493
+  dps: 7195.68141
   tps: 3621.8343
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SigilofVirulence-47673"
  value: {
-  dps: 7516.47909
+  dps: 7526.07987
   tps: 3790.32938
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SigiloftheBoneGryphon-50462"
  value: {
-  dps: 7186.46493
+  dps: 7195.68141
   tps: 3621.8343
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SigiloftheHangedMan-50459"
  value: {
-  dps: 7518.07844
+  dps: 7527.65563
   tps: 3795.8069
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SigiloftheUnfalteringKnight-40714"
  value: {
-  dps: 7186.46493
+  dps: 7195.68141
   tps: 3621.8343
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SoulPreserver-37111"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SouloftheDead-40382"
  value: {
-  dps: 6972.24234
+  dps: 6982.30771
   tps: 3538.32209
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SparkofLife-37657"
  value: {
-  dps: 6932.36483
+  dps: 6942.27291
   tps: 3518.00137
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 7048.84951
+  dps: 7059.26052
   tps: 3571.73143
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-StormshroudArmor"
  value: {
-  dps: 5602.82171
+  dps: 5611.58125
   tps: 2843.4078
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 7180.26011
+  dps: 7190.52418
   tps: 3620.2584
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 7174.89926
+  dps: 7185.15701
   tps: 3617.43413
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 7165.51777
+  dps: 7175.76447
   tps: 3612.49166
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Thassarian'sBattlegear"
  value: {
-  dps: 7073.97815
+  dps: 7083.80762
   tps: 3591.77194
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Thassarian'sPlate"
  value: {
-  dps: 6260.71787
+  dps: 6270.11615
   tps: 3164.62788
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 6211.23386
+  dps: 6218.4768
   tps: 3077.0563
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 7121.36499
+  dps: 7132.07814
   tps: 3584.71952
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 7140.87003
+  dps: 7151.07259
   tps: 3634.4872
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 7179.94904
+  dps: 7190.0168
   tps: 3655.35394
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 6930.59766
+  dps: 6940.64264
   tps: 3504.18574
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 7152.11564
+  dps: 7162.34655
   tps: 3605.43098
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 5922.27072
+  dps: 5931.21189
   tps: 3009.68158
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 5586.58871
+  dps: 5593.66263
   tps: 2655.73374
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-WingedTalisman-37844"
  value: {
-  dps: 6869.5029
+  dps: 6879.24571
   tps: 3485.56562
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-WrathfulGladiator'sSigilofStrife-51417"
  value: {
-  dps: 7198.78396
+  dps: 7208.04968
   tps: 3626.52663
  }
 }
 dps_results: {
  key: "TestBlood-Average-Default"
  value: {
-  dps: 7301.75255
+  dps: 7312.55549
   tps: 3695.0485
  }
 }
 dps_results: {
  key: "TestBlood-Settings-Human-Blood P1 -Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 19603.68285
+  dps: 19614.8013
   tps: 10252.53297
  }
 }
 dps_results: {
  key: "TestBlood-Settings-Human-Blood P1 -Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7188.05033
+  dps: 7197.97446
   tps: 3647.01804
  }
 }
 dps_results: {
  key: "TestBlood-Settings-Human-Blood P1 -Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9280.75587
+  dps: 9294.56495
   tps: 4149.14566
  }
 }
 dps_results: {
  key: "TestBlood-Settings-Human-Blood P1 -Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 10364.34965
+  dps: 10371.5224
   tps: 5420.00347
  }
 }
 dps_results: {
  key: "TestBlood-Settings-Human-Blood P1 -Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4073.50218
+  dps: 4080.18937
   tps: 2081.10054
  }
 }
 dps_results: {
  key: "TestBlood-Settings-Human-Blood P1 -Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4834.70819
+  dps: 4845.49034
   tps: 2147.27591
  }
 }
 dps_results: {
  key: "TestBlood-Settings-Orc-Blood P1 -Basic-FullBuffs-LongMultiTarget"
  value: {
-  dps: 19782.74167
+  dps: 19793.66163
   tps: 10320.16034
  }
 }
 dps_results: {
  key: "TestBlood-Settings-Orc-Blood P1 -Basic-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7290.41884
+  dps: 7300.95261
   tps: 3680.99074
  }
 }
 dps_results: {
  key: "TestBlood-Settings-Orc-Blood P1 -Basic-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9460.47137
+  dps: 9474.63347
   tps: 4205.87132
  }
 }
 dps_results: {
  key: "TestBlood-Settings-Orc-Blood P1 -Basic-NoBuffs-LongMultiTarget"
  value: {
-  dps: 10454.31546
+  dps: 10461.65835
   tps: 5459.50831
  }
 }
 dps_results: {
  key: "TestBlood-Settings-Orc-Blood P1 -Basic-NoBuffs-LongSingleTarget"
  value: {
-  dps: 4123.53983
+  dps: 4130.49624
   tps: 2096.63841
  }
 }
 dps_results: {
  key: "TestBlood-Settings-Orc-Blood P1 -Basic-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4925.53104
+  dps: 4936.0948
   tps: 2175.72771
  }
 }
 dps_results: {
  key: "TestBlood-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6978.83994
+  dps: 6988.8295
   tps: 3555.05133
  }
 }
diff --git a/sim/deathknight/heart_strike.go b/sim/deathknight/heart_strike.go
index 2b66e5058e..44dd5cbaf1 100644
--- a/sim/deathknight/heart_strike.go
+++ b/sim/deathknight/heart_strike.go
@@ -40,10 +40,14 @@ func (dk *Deathknight) newHeartStrikeSpell(isMainTarget bool, isDrw bool) *core.
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			baseDamage := 736 +
-				bonusBaseDamage +
-				spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower()) +
-				spell.BonusWeaponDamage()
+			baseDamage := 736 + bonusBaseDamage
+
+			if isDrw {
+				baseDamage += dk.DrwWeaponDamage(sim, spell)
+			} else {
+				baseDamage += spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower()) +
+					spell.BonusWeaponDamage()
+			}
 
 			activeDiseases := core.TernaryFloat64(isDrw, dk.drwCountActiveDiseases(target), dk.dkCountActiveDiseases(target))
 			baseDamage *= 1 + activeDiseases*diseaseMulti
diff --git a/sim/deathknight/icy_touch.go b/sim/deathknight/icy_touch.go
index a3e360f6a3..17d6e604d7 100644
--- a/sim/deathknight/icy_touch.go
+++ b/sim/deathknight/icy_touch.go
@@ -70,7 +70,7 @@ func (dk *Deathknight) registerDrwIcyTouchSpell() {
 		BonusCritRating:  dk.rimeCritBonus() * core.CritRatingPerCritChance,
 		DamageMultiplier: 1 + 0.05*float64(dk.Talents.ImprovedIcyTouch),
 		CritMultiplier:   dk.DefaultMeleeCritMultiplier(),
-		ThreatMultiplier: 7,
+		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
 			baseDamage := sim.Roll(227, 245) + sigilBonus + 0.1*dk.RuneWeapon.getImpurityBonus(spell)
diff --git a/sim/deathknight/plague_strike.go b/sim/deathknight/plague_strike.go
index 4ad6104680..ebe38a7e9e 100644
--- a/sim/deathknight/plague_strike.go
+++ b/sim/deathknight/plague_strike.go
@@ -90,9 +90,7 @@ func (dk *Deathknight) registerDrwPlagueStrikeSpell() {
 		ThreatMultiplier: 1,
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			baseDamage := 378 +
-				spell.Unit.MHNormalizedWeaponDamage(sim, spell.MeleeAttackPower()) +
-				spell.BonusWeaponDamage()
+			baseDamage := 378 + dk.DrwWeaponDamage(sim, spell)
 
 			result := spell.CalcAndDealDamage(sim, target, baseDamage, spell.OutcomeMeleeWeaponSpecialHitAndCrit)