diff --git a/sim/common/sod/enchant_effects.go b/sim/common/sod/enchant_effects.go
index 40d211943b..b96d250057 100644
--- a/sim/common/sod/enchant_effects.go
+++ b/sim/common/sod/enchant_effects.go
@@ -246,7 +246,7 @@ func init() {
 		character.AddStat(stats.FrostPower, bonus)
 	})
 
-	// Globes - Threat
+	// Gloves - Threat
 	// core.NewEnchantEffect(2613, func(agent core.Agent) {
 	// 	character := agent.GetCharacter()
 	// 	character.PseudoStats.ThreatMultiplier *= 1.02
diff --git a/sim/common/sod/item_effects/phase_2.go b/sim/common/sod/item_effects/phase_2.go
index f78da182ae..fc401f9e07 100644
--- a/sim/common/sod/item_effects/phase_2.go
+++ b/sim/common/sod/item_effects/phase_2.go
@@ -91,6 +91,10 @@ func init() {
 			Spell:    regChannel,
 			Priority: core.CooldownPriorityDefault,
 			Type:     core.CooldownTypeMana,
+			ShouldActivate: func(_ *core.Simulation, _ *core.Character) bool {
+				// Only castable with manual APL Action
+				return false
+			},
 		})
 	})
 
diff --git a/sim/common/sod/melee_items.go b/sim/common/sod/melee_items.go
index 7fbc82f3bb..21ec742bf8 100644
--- a/sim/common/sod/melee_items.go
+++ b/sim/common/sod/melee_items.go
@@ -325,7 +325,7 @@ func init() {
 			},
 		})
 
-		aura := character.GetOrRegisterAura(core.Aura{
+		character.GetOrRegisterAura(core.Aura{
 			Label:    "Mekkatorque Proc Aura",
 			Duration: core.NeverExpires,
 			OnReset: func(aura *core.Aura, sim *core.Simulation) {
@@ -341,8 +341,6 @@ func init() {
 				}
 			},
 		})
-
-		character.ItemSwap.RegisterOnSwapItemForEffect(36, aura)
 	})
 
 	core.AddEffectsToTest = true
diff --git a/sim/druid/balance/TestBalance.results b/sim/druid/balance/TestBalance.results
index fe129d6433..612b0527a5 100644
--- a/sim/druid/balance/TestBalance.results
+++ b/sim/druid/balance/TestBalance.results
@@ -151,9 +151,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.54428
+  weights: -0.42992
   weights: 0
-  weights: 0.79455
+  weights: 0.82502
   weights: 0
   weights: 0
   weights: 0
@@ -161,8 +161,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 6.33103
-  weights: 3.90042
+  weights: 7.319
+  weights: 4.38145
   weights: 0
   weights: 0
   weights: 0
@@ -358,161 +358,161 @@ dps_results: {
 dps_results: {
  key: "TestBalance-Lvl40-AllItems-BlackfathomElementalist'sHide"
  value: {
-  dps: 306.70804
-  tps: 314.16812
+  dps: 310.47817
+  tps: 317.77271
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-AllItems-BlackfathomSlayer'sLeather"
  value: {
-  dps: 286.31109
-  tps: 293.67216
+  dps: 287.84422
+  tps: 295.03151
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-AllItems-HyperconductiveMender'sMeditation"
  value: {
-  dps: 165.774
-  tps: 172.17609
+  dps: 168.33065
+  tps: 174.32444
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-AllItems-HyperconductiveWizard'sAttire"
  value: {
-  dps: 175.20144
-  tps: 181.5564
+  dps: 177.85392
+  tps: 183.77622
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-AllItems-InsulatedLeathers"
  value: {
-  dps: 161.5218
-  tps: 167.84376
+  dps: 163.47343
+  tps: 169.35448
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-AllItems-InsulatedSorceror'sLeathers"
  value: {
-  dps: 177.04309
-  tps: 183.38705
+  dps: 179.20289
+  tps: 185.11969
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-AllItems-IrradiatedGarments"
  value: {
-  dps: 182.78674
-  tps: 189.15631
+  dps: 182.94073
+  tps: 188.87953
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-AllItems-StormshroudArmor"
  value: {
-  dps: 129.19903
-  tps: 135.40549
+  dps: 128.99257
+  tps: 134.74162
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-AllItems-TwilightInvoker'sVestments"
  value: {
-  dps: 301.74535
-  tps: 309.18617
+  dps: 305.57224
+  tps: 312.83929
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Average-Default"
  value: {
-  dps: 543.00319
-  tps: 552.34402
+  dps: 561.29658
+  tps: 570.59972
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 541.31557
-  tps: 728.79699
+  dps: 558.9036
+  tps: 745.02582
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 541.31557
-  tps: 550.68964
+  dps: 558.9036
+  tps: 568.20971
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Settings-NightElf-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 475.33351
-  tps: 487.52987
+  dps: 584.73723
+  tps: 596.85504
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 373.3469
-  tps: 458.97675
+  dps: 381.04236
+  tps: 461.20832
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 373.3469
-  tps: 377.62839
+  dps: 381.04236
+  tps: 385.05066
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Settings-NightElf-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 370.8672
-  tps: 378.94067
+  dps: 451.12948
+  tps: 457.83698
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 541.72306
-  tps: 729.58948
+  dps: 561.02719
+  tps: 747.53442
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 541.72306
-  tps: 551.11638
+  dps: 561.02719
+  tps: 570.35256
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Settings-Tauren-phase_2-Default-phase_2-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 474.42369
-  tps: 486.62006
+  dps: 584.73723
+  tps: 596.85504
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 370.56291
-  tps: 456.19276
+  dps: 379.63737
+  tps: 459.80333
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 370.56291
-  tps: 374.8444
+  dps: 379.63737
+  tps: 383.64566
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-Settings-Tauren-phase_2-Default-phase_2-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 370.5654
-  tps: 378.63887
+  dps: 449.55232
+  tps: 456.25982
  }
 }
 dps_results: {
  key: "TestBalance-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 541.72306
-  tps: 551.11638
+  dps: 561.02719
+  tps: 570.35256
  }
 }
diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
index 59882a2df5..a0a5fbadab 100644
--- a/sim/shaman/elemental/TestElemental.results
+++ b/sim/shaman/elemental/TestElemental.results
@@ -151,18 +151,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.98295
+  weights: 1.74201
   weights: 0
-  weights: 0.80404
+  weights: 0.85126
   weights: 0
-  weights: 0.29816
+  weights: 0.30516
   weights: 0
   weights: 0
-  weights: 0.50588
+  weights: 0.54609
   weights: 0
   weights: 0
-  weights: 9.52267
-  weights: 3.33079
+  weights: 10.32877
+  weights: 3.83691
   weights: 0
   weights: 0
   weights: 0
@@ -379,182 +379,182 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-BlackfathomAvenger'sMail"
  value: {
-  dps: 406.80569
-  tps: 400.79288
+  dps: 423.83642
+  tps: 421.61331
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-BlackfathomElementalist'sHide"
  value: {
-  dps: 457.09207
-  tps: 451.30825
+  dps: 474.04096
+  tps: 472.74522
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-BlackfathomSlayer'sLeather"
  value: {
-  dps: 406.83132
-  tps: 400.7843
+  dps: 423.83642
+  tps: 421.61331
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-ElectromanticDevastator'sMail"
  value: {
-  dps: 274.80723
-  tps: 251.12509
+  dps: 278.94895
+  tps: 258.84813
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-ElectromanticStormbringer'sChain"
  value: {
-  dps: 287.24921
-  tps: 260.15536
+  dps: 290.25279
+  tps: 267.3723
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-HyperconductiveMender'sMeditation"
  value: {
-  dps: 285.81706
-  tps: 262.30977
+  dps: 293.0134
+  tps: 272.61729
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-HyperconductiveWizard'sAttire"
  value: {
-  dps: 289.75496
-  tps: 262.92269
+  dps: 300.21042
+  tps: 277.05026
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-InsulatedLeathers"
  value: {
-  dps: 256.11152
-  tps: 231.75864
+  dps: 261.45355
+  tps: 240.2479
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-InsulatedSorceror'sLeathers"
  value: {
-  dps: 285.78613
-  tps: 259.56793
+  dps: 293.77549
+  tps: 271.67545
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-IrradiatedGarments"
  value: {
-  dps: 305.82725
-  tps: 278.16136
+  dps: 309.63075
+  tps: 284.84081
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-StormshroudArmor"
  value: {
-  dps: 198.50767
-  tps: 174.10302
+  dps: 199.12403
+  tps: 173.97695
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-AllItems-TwilightInvoker'sVestments"
  value: {
-  dps: 442.3423
-  tps: 436.3035
+  dps: 462.66546
+  tps: 460.87535
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Average-Default"
  value: {
-  dps: 602.55843
-  tps: 509.58072
+  dps: 629.95873
+  tps: 537.55151
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 725.26969
-  tps: 1165.09327
+  dps: 756.00059
+  tps: 1196.69865
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 592.39465
-  tps: 503.60784
+  dps: 610.34346
+  tps: 520.63484
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 537.57351
-  tps: 453.2324
+  dps: 678.42558
+  tps: 591.24589
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 390.21546
-  tps: 724.02205
+  dps: 406.67345
+  tps: 759.37799
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 321.52736
-  tps: 275.05954
+  dps: 339.39925
+  tps: 292.60501
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 364.21361
-  tps: 303.97297
+  dps: 459.56758
+  tps: 404.21643
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 727.39965
-  tps: 1144.55072
+  dps: 766.25691
+  tps: 1197.75014
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 592.22456
-  tps: 502.36341
+  dps: 628.41442
+  tps: 535.27223
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 566.83712
-  tps: 475.09248
+  dps: 713.74383
+  tps: 623.54184
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 386.85793
-  tps: 718.25271
+  dps: 409.80899
+  tps: 767.34454
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 316.96969
-  tps: 270.86026
+  dps: 342.90436
+  tps: 295.84928
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 379.29484
-  tps: 317.92991
+  dps: 480.0714
+  tps: 425.09038
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 592.22456
-  tps: 502.36341
+  dps: 628.41442
+  tps: 535.27223
  }
 }
diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results
index 31f345510f..e8200b812c 100644
--- a/sim/warlock/dps/TestAffliction.results
+++ b/sim/warlock/dps/TestAffliction.results
@@ -20,14 +20,14 @@ character_stats_results: {
   final_stats: 0
   final_stats: 348.93
   final_stats: 1
-  final_stats: 7
+  final_stats: 9.8255
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 4038.7
   final_stats: 0
   final_stats: 0
-  final_stats: 2065.96
+  final_stats: 2255.96
   final_stats: 50
   final_stats: 0
   final_stats: 0
diff --git a/sim/warlock/dps/TestDemonology.results b/sim/warlock/dps/TestDemonology.results
index 0ef3612560..178d0fd015 100644
--- a/sim/warlock/dps/TestDemonology.results
+++ b/sim/warlock/dps/TestDemonology.results
@@ -20,14 +20,14 @@ character_stats_results: {
   final_stats: 0
   final_stats: 348.93
   final_stats: 2
-  final_stats: 17
+  final_stats: 19.8255
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 3972.7
   final_stats: 0
   final_stats: 0
-  final_stats: 2067.96
+  final_stats: 2227.96
   final_stats: 50
   final_stats: 0
   final_stats: 0
diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results
index cabe1ebf2c..bbb96f7126 100644
--- a/sim/warlock/dps/TestDestruction.results
+++ b/sim/warlock/dps/TestDestruction.results
@@ -20,14 +20,14 @@ character_stats_results: {
   final_stats: 10
   final_stats: 211.39
   final_stats: 0
-  final_stats: 4
+  final_stats: 7.33967
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 2336.6
   final_stats: 0
   final_stats: 0
-  final_stats: 1628.98
+  final_stats: 1649.98
   final_stats: 20
   final_stats: 0
   final_stats: 0
@@ -69,14 +69,14 @@ character_stats_results: {
   final_stats: 0
   final_stats: 348.93
   final_stats: 2
-  final_stats: 7
+  final_stats: 9.8255
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 3840.7
   final_stats: 0
   final_stats: 0
-  final_stats: 2067.96
+  final_stats: 2227.96
   final_stats: 50
   final_stats: 0
   final_stats: 0
diff --git a/sim/warlock/tank/TestAffliction.results b/sim/warlock/tank/TestAffliction.results
index eadc3ced60..94c55ae343 100644
--- a/sim/warlock/tank/TestAffliction.results
+++ b/sim/warlock/tank/TestAffliction.results
@@ -20,14 +20,14 @@ character_stats_results: {
   final_stats: 10
   final_stats: 220.19
   final_stats: 1
-  final_stats: 4
+  final_stats: 8.13959
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 2386.1
   final_stats: 0
   final_stats: 0
-  final_stats: 1653.58
+  final_stats: 1674.58
   final_stats: 20
   final_stats: 0
   final_stats: 0
diff --git a/sim/warlock/tank/TestDemonology.results b/sim/warlock/tank/TestDemonology.results
index fb09caf88c..59f2f8bcdd 100644
--- a/sim/warlock/tank/TestDemonology.results
+++ b/sim/warlock/tank/TestDemonology.results
@@ -20,14 +20,14 @@ character_stats_results: {
   final_stats: 0
   final_stats: 352.23
   final_stats: 2
-  final_stats: 5
+  final_stats: 8.82364
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 3972.7
   final_stats: 0
   final_stats: 0
-  final_stats: 2146.56
+  final_stats: 2588.56
   final_stats: 50
   final_stats: 0
   final_stats: 0
@@ -53,9 +53,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.36841
+  weights: -0.14714
   weights: 0
-  weights: 1.05681
+  weights: 0.62512
   weights: 0
   weights: 0
   weights: 0
@@ -63,8 +63,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 6.31831
-  weights: 2.23717
+  weights: 6.57263
+  weights: 2.25758
   weights: 0
   weights: 0
   weights: 0
@@ -99,15 +99,15 @@ stat_weights_results: {
 dps_results: {
  key: "TestDemonology-Lvl40-AllItems-HyperconductiveMender'sMeditation"
  value: {
-  dps: 193.63433
-  tps: 156.76051
+  dps: 193.61724
+  tps: 156.51199
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-AllItems-HyperconductiveWizard'sAttire"
  value: {
-  dps: 204.49452
-  tps: 168.86982
+  dps: 204.51271
+  tps: 168.57613
  }
 }
 dps_results: {
@@ -120,70 +120,70 @@ dps_results: {
 dps_results: {
  key: "TestDemonology-Lvl40-AllItems-IrradiatedGarments"
  value: {
-  dps: 207.97806
-  tps: 172.45422
+  dps: 207.89016
+  tps: 172.36435
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-AllItems-TwilightInvoker'sVestments"
  value: {
-  dps: 199.31376
-  tps: 164.94078
+  dps: 198.9019
+  tps: 164.21664
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Average-Default"
  value: {
-  dps: 517.82632
-  tps: 1017.26588
+  dps: 528.57031
+  tps: 1049.6937
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 512.69068
-  tps: 1509.8642
+  dps: 525.88535
+  tps: 1557.76763
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 512.69068
-  tps: 1008.14833
+  dps: 525.88535
+  tps: 1045.87475
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 496.70033
-  tps: 924.0982
+  dps: 558.70642
+  tps: 1103.87287
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 298.99843
-  tps: 1185.90532
+  dps: 303.627
+  tps: 1212.15572
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 298.99843
-  tps: 633.64022
+  dps: 303.627
+  tps: 648.60543
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-Settings-Orc-p2.demo.tank-Demonology Warlock-p2.demo.tank-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 294.40905
-  tps: 588.42794
+  dps: 329.72
+  tps: 693.17174
  }
 }
 dps_results: {
  key: "TestDemonology-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 512.69068
-  tps: 1008.14833
+  dps: 525.88535
+  tps: 1045.87475
  }
 }
diff --git a/sim/warlock/tank/TestDestruction.results b/sim/warlock/tank/TestDestruction.results
index 8fe11917e4..4cb4afa6b4 100644
--- a/sim/warlock/tank/TestDestruction.results
+++ b/sim/warlock/tank/TestDestruction.results
@@ -20,14 +20,14 @@ character_stats_results: {
   final_stats: 10
   final_stats: 220.19
   final_stats: 1
-  final_stats: 4
+  final_stats: 8.13959
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 2386.1
   final_stats: 0
   final_stats: 0
-  final_stats: 1653.58
+  final_stats: 1674.58
   final_stats: 20
   final_stats: 0
   final_stats: 0
@@ -69,14 +69,14 @@ character_stats_results: {
   final_stats: 0
   final_stats: 352.23
   final_stats: 2
-  final_stats: 5
+  final_stats: 8.82364
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 3923.2
   final_stats: 0
   final_stats: 0
-  final_stats: 2146.56
+  final_stats: 2588.56
   final_stats: 50
   final_stats: 0
   final_stats: 0
@@ -151,9 +151,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.34873
+  weights: -0.69302
   weights: 0
-  weights: 0.73056
+  weights: 0.22299
   weights: 0
   weights: 0
   weights: 0
@@ -161,8 +161,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 5.57587
-  weights: 3.81976
+  weights: 4.72364
+  weights: 3.99626
   weights: 0
   weights: 0
   weights: 0
@@ -288,84 +288,84 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl40-AllItems-HyperconductiveMender'sMeditation"
  value: {
-  dps: 84.67049
-  tps: 106.59292
+  dps: 84.50492
+  tps: 105.74084
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-AllItems-HyperconductiveWizard'sAttire"
  value: {
-  dps: 88.3231
-  tps: 108.17875
+  dps: 89.69228
+  tps: 112.08566
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-AllItems-IrradiatedGarments"
  value: {
-  dps: 90.01555
-  tps: 110.77074
+  dps: 88.78786
+  tps: 107.54785
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-AllItems-TwilightInvoker'sVestments"
  value: {
-  dps: 86.81835
-  tps: 112.23999
+  dps: 86.71032
+  tps: 111.41753
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Average-Default"
  value: {
-  dps: 534.79904
-  tps: 1291.91263
+  dps: 533.39579
+  tps: 1288.59814
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 554.11604
-  tps: 1732.27145
+  dps: 553.76537
+  tps: 1732.29587
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 534.447
-  tps: 1290.28973
+  dps: 533.62901
+  tps: 1288.83929
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
   dps: 593.56943
-  tps: 1384.28475
+  tps: 1381.26071
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 338.91957
-  tps: 1304.42131
+  dps: 338.23663
+  tps: 1307.79484
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 325.07887
-  tps: 804.50624
+  dps: 323.10242
+  tps: 798.17589
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-Settings-Orc-p2.destro.tank-Destruction Warlock-p2.destro.tank-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 380.81413
-  tps: 876.06039
+  dps: 374.59493
+  tps: 858.4317
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 534.447
-  tps: 1290.28973
+  dps: 533.62901
+  tps: 1288.83929
  }
 }
diff --git a/sim/warlock/warlock.go b/sim/warlock/warlock.go
index 3e82b864e4..25706d22e1 100644
--- a/sim/warlock/warlock.go
+++ b/sim/warlock/warlock.go
@@ -142,7 +142,10 @@ func NewWarlock(character *core.Character, options *proto.Player, warlockOptions
 	warlock.EnableManaBar()
 
 	warlock.AddStatDependency(stats.Strength, stats.AttackPower, 1)
+	warlock.AddStatDependency(stats.BonusArmor, stats.Armor, 1)
+
 	warlock.AddStatDependency(stats.Intellect, stats.SpellCrit, core.CritPerIntAtLevel[warlock.Class][int(warlock.Level)]*core.SpellCritRatingPerCritChance)
+	warlock.AddStatDependency(stats.Agility, stats.MeleeCrit, core.CritPerAgiAtLevel[warlock.Class][int(warlock.Level)]*core.CritRatingPerCritChance)
 
 	if warlock.Options.Armor == proto.WarlockOptions_DemonArmor {
 		armor := map[int32]float64{