diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
index 1646479237..04eb9b479d 100644
--- a/sim/shaman/elemental/TestElemental.results
+++ b/sim/shaman/elemental/TestElemental.results
@@ -52,19 +52,19 @@ character_stats_results: {
  value: {
   final_stats: 128.7
   final_stats: 59.4
-  final_stats: 251.9
-  final_stats: 209
+  final_stats: 244.2
+  final_stats: 204.6
   final_stats: 133.1
-  final_stats: 268
+  final_stats: 233
   final_stats: 0
   final_stats: 10
   final_stats: 0
   final_stats: 0
   final_stats: 17
   final_stats: 0
-  final_stats: 69.75
+  final_stats: 69.15
   final_stats: 4
-  final_stats: 14.7758
+  final_stats: 14.66052
   final_stats: 0
   final_stats: 0
   final_stats: 647.2
@@ -73,10 +73,10 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 3830
+  final_stats: 3764
   final_stats: 0
   final_stats: 0
-  final_stats: 1912.8
+  final_stats: 1842.8
   final_stats: 100
   final_stats: 0
   final_stats: 0
@@ -84,13 +84,13 @@ character_stats_results: {
   final_stats: 1.7
   final_stats: 0
   final_stats: 0
-  final_stats: 2949
+  final_stats: 2872
   final_stats: 21
   final_stats: 43
   final_stats: 33
   final_stats: 38
   final_stats: 43
-  final_stats: 333
+  final_stats: 263
   final_stats: 0
   final_stats: 14
   final_stats: 0
@@ -148,49 +148,49 @@ character_stats_results: {
 character_stats_results: {
  key: "TestElemental-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 236.5
-  final_stats: 184.8
-  final_stats: 432.63
-  final_stats: 321.2
-  final_stats: 212.3
-  final_stats: 265
+  final_stats: 217.8
+  final_stats: 185.9
+  final_stats: 471.845
+  final_stats: 363
+  final_stats: 193.6
+  final_stats: 573
   final_stats: 0
   final_stats: 40
-  final_stats: 23
   final_stats: 0
-  final_stats: 23
   final_stats: 0
-  final_stats: 92.1
-  final_stats: 7
-  final_stats: 33.72828
   final_stats: 0
   final_stats: 0
-  final_stats: 1526
-  final_stats: 7
-  final_stats: 28.69668
+  final_stats: 92.3
+  final_stats: 9
+  final_stats: 34.4347
   final_stats: 0
   final_stats: 0
+  final_stats: 1528.6
+  final_stats: 9
+  final_stats: 28.75256
   final_stats: 0
-  final_stats: 6058
   final_stats: 0
   final_stats: 0
-  final_stats: 2155.2
-  final_stats: 540
+  final_stats: 6685
   final_stats: 0
   final_stats: 0
+  final_stats: 3173.4
+  final_stats: 580
   final_stats: 0
-  final_stats: 1.7
   final_stats: 0
   final_stats: 0
-  final_stats: 5869.3
-  final_stats: 30
-  final_stats: 73
-  final_stats: 63
-  final_stats: 63
-  final_stats: 63
-  final_stats: 494
+  final_stats: 1.7
   final_stats: 0
-  final_stats: 140
+  final_stats: 0
+  final_stats: 6261.45
+  final_stats: 27
+  final_stats: 121
+  final_stats: 60
+  final_stats: 60
+  final_stats: 60
+  final_stats: 384
+  final_stats: 44
+  final_stats: 238
   final_stats: 0
  }
 }
@@ -249,18 +249,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.53991
+  weights: 0.59227
   weights: 0
-  weights: 0.75885
+  weights: 0.74284
   weights: 0
-  weights: 0.22015
+  weights: 0.21686
   weights: 0
   weights: 0
-  weights: 0.5387
+  weights: 0.52599
   weights: 0
   weights: 0
-  weights: 6.61337
-  weights: 1.72512
+  weights: 5.73666
+  weights: 1.61331
   weights: 0
   weights: 0
   weights: 0
@@ -347,18 +347,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.09438
   weights: 0
-  weights: 1.07177
   weights: 0
-  weights: 0.313
+  weights: 1.32347
+  weights: 0
+  weights: 0.41189
+  weights: 0
   weights: 0
+  weights: 0.91158
   weights: 0
-  weights: 0.75877
   weights: 0
   weights: 0
-  weights: 20.08156
-  weights: 3.25856
+  weights: 6.05854
   weights: 0
   weights: 0
   weights: 0
@@ -491,99 +491,99 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl40-Average-Default"
  value: {
-  dps: 550.18801
-  tps: 477.19969
+  dps: 512.58933
+  tps: 445.40275
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 512.31098
-  tps: 1013.1764
+  dps: 480.1126
+  tps: 975.55923
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 510.43734
-  tps: 439.9003
+  dps: 480.2797
+  tps: 413.70127
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 545.73034
-  tps: 472.86595
+  dps: 518.57883
+  tps: 449.59293
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 283.31094
-  tps: 684.51598
+  dps: 264.84478
+  tps: 664.51804
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 290.04992
-  tps: 252.02104
+  dps: 273.6452
+  tps: 239.04726
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Orc-phase_2-Adaptive-phase_2-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 386.30477
-  tps: 336.87008
+  dps: 366.07885
+  tps: 320.71695
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-FullBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 510.7619
-  tps: 1009.87026
+  dps: 483.08944
+  tps: 981.50351
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-FullBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 509.23756
-  tps: 438.35539
+  dps: 480.10841
+  tps: 414.70048
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-FullBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 569.58268
-  tps: 498.90492
+  dps: 542.25844
+  tps: 476.63192
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-NoBuffs-Phase 2 Consumes-LongMultiTarget"
  value: {
-  dps: 286.28485
-  tps: 691.27735
+  dps: 266.88685
+  tps: 669.76938
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-NoBuffs-Phase 2 Consumes-LongSingleTarget"
  value: {
-  dps: 290.99643
-  tps: 253.49105
+  dps: 269.14777
+  tps: 234.91482
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-Settings-Troll-phase_2-Adaptive-phase_2-NoBuffs-Phase 2 Consumes-ShortSingleTarget"
  value: {
-  dps: 401.1675
-  tps: 354.93909
+  dps: 381.97507
+  tps: 338.32173
  }
 }
 dps_results: {
  key: "TestElemental-Lvl40-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 549.57598
-  tps: 476.64061
+  dps: 512.5611
+  tps: 445.43518
  }
 }
 dps_results: {
@@ -687,161 +687,161 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-BloodGuard'sInscribedMail"
  value: {
-  dps: 712.32146
-  tps: 767.44727
+  dps: 1206.47709
+  tps: 1257.25572
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-BloodGuard'sMail"
  value: {
-  dps: 712.56222
-  tps: 767.59036
+  dps: 1208.79166
+  tps: 1259.81648
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-BloodGuard'sPulsingMail"
  value: {
-  dps: 804.68119
-  tps: 856.37101
+  dps: 1311.33296
+  tps: 1359.33207
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-EmeraldChainmail"
  value: {
-  dps: 767.22933
-  tps: 820.72502
+  dps: 1270.58435
+  tps: 1319.77152
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-EmeraldLadenChain"
  value: {
-  dps: 711.44693
-  tps: 766.5666
+  dps: 1205.30394
+  tps: 1256.23754
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-EmeraldScalemail"
  value: {
-  dps: 711.77803
-  tps: 766.89769
+  dps: 1207.52066
+  tps: 1258.45426
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-OstracizedBerserker'sBattlemail"
  value: {
-  dps: 1011.49108
-  tps: 1056.96217
+  dps: 1669.29369
+  tps: 1698.55213
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-ShunnedDevotee'sChainmail"
  value: {
-  dps: 1087.86987
-  tps: 1132.47737
+  dps: 1759.27028
+  tps: 1787.91679
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-AllItems-TheFiveThunders"
  value: {
-  dps: 668.02874
-  tps: 670.88994
+  dps: 1116.97784
+  tps: 1101.96815
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-Average-Default"
  value: {
-  dps: 1298.68294
-  tps: 1204.09176
+  dps: 2191.21193
+  tps: 1391.69367
  }
 }
 dps_results: {
- key: "TestElemental-Lvl60-Settings-Orc-phase_3-Adaptive-phase_4-FullBuffs-Phase 3 Consumes-LongMultiTarget"
+ key: "TestElemental-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget"
  value: {
-  dps: 2388.87311
-  tps: 2259.31814
+  dps: 3534.25433
+  tps: 2556.84217
  }
 }
 dps_results: {
- key: "TestElemental-Lvl60-Settings-Orc-phase_3-Adaptive-phase_4-FullBuffs-Phase 3 Consumes-LongSingleTarget"
+ key: "TestElemental-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-Phase 4 Consumes-LongSingleTarget"
  value: {
-  dps: 1251.49054
-  tps: 1157.84985
+  dps: 2088.22222
+  tps: 1319.15849
  }
 }
 dps_results: {
- key: "TestElemental-Lvl60-Settings-Orc-phase_3-Adaptive-phase_4-FullBuffs-Phase 3 Consumes-ShortSingleTarget"
+ key: "TestElemental-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-FullBuffs-Phase 4 Consumes-ShortSingleTarget"
  value: {
-  dps: 1347.22274
-  tps: 1288.35886
+  dps: 2183.04811
+  tps: 1389.66
  }
 }
 dps_results: {
- key: "TestElemental-Lvl60-Settings-Orc-phase_3-Adaptive-phase_4-NoBuffs-Phase 3 Consumes-LongMultiTarget"
+ key: "TestElemental-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget"
  value: {
-  dps: 1042.95868
-  tps: 1265.16455
+  dps: 1648.95177
+  tps: 1512.70611
  }
 }
 dps_results: {
- key: "TestElemental-Lvl60-Settings-Orc-phase_3-Adaptive-phase_4-NoBuffs-Phase 3 Consumes-LongSingleTarget"
+ key: "TestElemental-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-Phase 4 Consumes-LongSingleTarget"
  value: {
-  dps: 675.02595
-  tps: 637.72749
+  dps: 1199.92049
+  tps: 782.24924
  }
 }
 dps_results: {
- key: "TestElemental-Lvl60-Settings-Orc-phase_3-Adaptive-phase_4-NoBuffs-Phase 3 Consumes-ShortSingleTarget"
+ key: "TestElemental-Lvl60-Settings-Orc-phase_4-Adaptive-phase_4-NoBuffs-Phase 4 Consumes-ShortSingleTarget"
  value: {
-  dps: 787.91378
-  tps: 766.64425
+  dps: 1282.22035
+  tps: 835.02934
  }
 }
 dps_results: {
- key: "TestElemental-Lvl60-Settings-Troll-phase_3-Adaptive-phase_4-FullBuffs-Phase 3 Consumes-LongMultiTarget"
+ key: "TestElemental-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-Phase 4 Consumes-LongMultiTarget"
  value: {
-  dps: 2374.33784
-  tps: 2254.79143
+  dps: 3490.72769
+  tps: 2535.28568
  }
 }
 dps_results: {
- key: "TestElemental-Lvl60-Settings-Troll-phase_3-Adaptive-phase_4-FullBuffs-Phase 3 Consumes-LongSingleTarget"
+ key: "TestElemental-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-Phase 4 Consumes-LongSingleTarget"
  value: {
-  dps: 1270.60887
-  tps: 1174.05246
+  dps: 2114.87707
+  tps: 1337.77395
  }
 }
 dps_results: {
- key: "TestElemental-Lvl60-Settings-Troll-phase_3-Adaptive-phase_4-FullBuffs-Phase 3 Consumes-ShortSingleTarget"
+ key: "TestElemental-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-FullBuffs-Phase 4 Consumes-ShortSingleTarget"
  value: {
-  dps: 1338.04067
-  tps: 1271.35023
+  dps: 2158.25302
+  tps: 1366.25196
  }
 }
 dps_results: {
- key: "TestElemental-Lvl60-Settings-Troll-phase_3-Adaptive-phase_4-NoBuffs-Phase 3 Consumes-LongMultiTarget"
+ key: "TestElemental-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-Phase 4 Consumes-LongMultiTarget"
  value: {
-  dps: 1022.04468
-  tps: 1248.47688
+  dps: 1638.45851
+  tps: 1499.33337
  }
 }
 dps_results: {
- key: "TestElemental-Lvl60-Settings-Troll-phase_3-Adaptive-phase_4-NoBuffs-Phase 3 Consumes-LongSingleTarget"
+ key: "TestElemental-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-Phase 4 Consumes-LongSingleTarget"
  value: {
-  dps: 677.22555
-  tps: 642.67251
+  dps: 1220.64707
+  tps: 794.80341
  }
 }
 dps_results: {
- key: "TestElemental-Lvl60-Settings-Troll-phase_3-Adaptive-phase_4-NoBuffs-Phase 3 Consumes-ShortSingleTarget"
+ key: "TestElemental-Lvl60-Settings-Troll-phase_4-Adaptive-phase_4-NoBuffs-Phase 4 Consumes-ShortSingleTarget"
  value: {
-  dps: 809.00562
-  tps: 791.2987
+  dps: 1274.39727
+  tps: 829.96094
  }
 }
 dps_results: {
  key: "TestElemental-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 1288.97285
-  tps: 1194.05706
+  dps: 2166.44617
+  tps: 1374.17234
  }
 }
diff --git a/sim/warlock/dps/TestAffliction.results b/sim/warlock/dps/TestAffliction.results
index 3362a9f1ad..7ab948076a 100644
--- a/sim/warlock/dps/TestAffliction.results
+++ b/sim/warlock/dps/TestAffliction.results
@@ -99,33 +99,33 @@ character_stats_results: {
 character_stats_results: {
  key: "TestAffliction-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 167.2
-  final_stats: 173.8
-  final_stats: 436.425
-  final_stats: 375.1
-  final_stats: 232.1
-  final_stats: 537
+  final_stats: 168.3
+  final_stats: 174.9
+  final_stats: 433.895
+  final_stats: 357.5
+  final_stats: 235.4
+  final_stats: 579
   final_stats: 23
   final_stats: 40
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 128
+  final_stats: 77
   final_stats: 49.6
   final_stats: 6
-  final_stats: 39.88915
+  final_stats: 37.59875
   final_stats: 0
   final_stats: 0
-  final_stats: 1117.2
+  final_stats: 1118.3
   final_stats: 6
-  final_stats: 33.305
+  final_stats: 32.36
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 6719.5
+  final_stats: 6455.5
   final_stats: 0
   final_stats: 0
-  final_stats: 1839.2
+  final_stats: 1909.4
   final_stats: 540
   final_stats: 0
   final_stats: 0
@@ -133,15 +133,15 @@ character_stats_results: {
   final_stats: 2
   final_stats: 0
   final_stats: 0
-  final_stats: 5898.25
+  final_stats: 5872.95
   final_stats: 27
-  final_stats: 70
+  final_stats: 134
   final_stats: 60
   final_stats: 60
-  final_stats: 75
+  final_stats: 83
   final_stats: 384
   final_stats: 0
-  final_stats: 35
+  final_stats: 65
   final_stats: 0
  }
 }
@@ -249,9 +249,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.6705
+  weights: 0.95329
   weights: 0
-  weights: 1.21807
+  weights: -0.11399
   weights: 0
   weights: 0
   weights: 0
@@ -259,8 +259,8 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 14.74913
-  weights: 15.55069
+  weights: 9.82104
+  weights: 20.8158
   weights: 0
   weights: 0
   weights: 0
@@ -421,119 +421,112 @@ dps_results: {
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 1216.68979
-  tps: 1125.72147
+  dps: 741.09163
+  tps: 619.42685
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-DeathmistRaiment"
  value: {
-  dps: 1080.28059
-  tps: 989.28386
+  dps: 611.46281
+  tps: 488.32513
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 1203.86661
-  tps: 1113.39589
+  dps: 738.74666
+  tps: 617.01989
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-InfernalPactEssence-216509"
  value: {
-  dps: 2026.72013
-  tps: 1871.5181
+  dps: 2376.77874
+  tps: 2279.07378
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-IronweaveBattlesuit"
  value: {
-  dps: 1023.97686
-  tps: 938.32345
+  dps: 607.36563
+  tps: 489.42488
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 1216.68979
-  tps: 1125.72147
+  dps: 741.09163
+  tps: 619.42685
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1642.61479
-  tps: 1537.87329
+  dps: 1209.94538
+  tps: 1079.67174
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-AllItems-NightmareProphet'sGarb"
  value: {
-  dps: 1613.25972
-  tps: 1509.13946
- }
-}
-dps_results: {
- key: "TestAffliction-Lvl60-AllItems-ZilaGular-223214"
- value: {
-  dps: 2053.08771
-  tps: 1898.98538
+  dps: 1187.45975
+  tps: 1055.63792
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-Average-Default"
  value: {
-  dps: 2109.93376
-  tps: 1951.25621
+  dps: 2464.99485
+  tps: 2368.34331
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-FullBuffs-Phase 4 Consumes-LongMultiTarget"
  value: {
-  dps: 2095.52686
-  tps: 3077.79298
+  dps: 2431.39045
+  tps: 3701.07805
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-FullBuffs-Phase 4 Consumes-LongSingleTarget"
  value: {
-  dps: 2095.52686
-  tps: 1936.23269
+  dps: 2431.39045
+  tps: 2335.9373
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-FullBuffs-Phase 4 Consumes-ShortSingleTarget"
  value: {
-  dps: 2090.95849
-  tps: 1922.17884
+  dps: 2404.39327
+  tps: 2271.20642
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-NoBuffs-Phase 4 Consumes-LongMultiTarget"
  value: {
-  dps: 1095.05239
-  tps: 2247.91596
+  dps: 1283.80321
+  tps: 2721.02255
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-NoBuffs-Phase 4 Consumes-LongSingleTarget"
  value: {
-  dps: 1095.05239
-  tps: 1009.42698
+  dps: 1283.80321
+  tps: 1245.70225
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-Settings-Orc-affliction-Affliction Warlock-affliction-NoBuffs-Phase 4 Consumes-ShortSingleTarget"
  value: {
-  dps: 1122.95164
-  tps: 1027.90799
+  dps: 1269.46899
+  tps: 1206.55713
  }
 }
 dps_results: {
  key: "TestAffliction-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2097.35294
-  tps: 1939.55949
+  dps: 2449.00749
+  tps: 2352.03443
  }
 }
diff --git a/sim/warlock/dps/TestDestruction.results b/sim/warlock/dps/TestDestruction.results
index ad7c9c2dd1..46cf8377ed 100644
--- a/sim/warlock/dps/TestDestruction.results
+++ b/sim/warlock/dps/TestDestruction.results
@@ -148,33 +148,33 @@ character_stats_results: {
 character_stats_results: {
  key: "TestDestruction-Lvl60-CharacterStats-Default"
  value: {
-  final_stats: 167.2
-  final_stats: 173.8
-  final_stats: 522.25525
-  final_stats: 368.5
-  final_stats: 213.18
-  final_stats: 511
+  final_stats: 168.3
+  final_stats: 174.9
+  final_stats: 488.796
+  final_stats: 377.3
+  final_stats: 223.63
+  final_stats: 573
   final_stats: 0
-  final_stats: 104
+  final_stats: 80
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 40
   final_stats: 49.6
-  final_stats: 9
-  final_stats: 40.78025
+  final_stats: 10
+  final_stats: 45.92545
   final_stats: 0
   final_stats: 0
-  final_stats: 1117.2
-  final_stats: 8
-  final_stats: 34.305
+  final_stats: 1118.3
+  final_stats: 9
+  final_stats: 40.36
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 6620.5
+  final_stats: 6752.5
   final_stats: 0
   final_stats: 0
-  final_stats: 1955.2
+  final_stats: 1899.4
   final_stats: 540
   final_stats: 0
   final_stats: 0
@@ -182,15 +182,15 @@ character_stats_results: {
   final_stats: 2
   final_stats: 0
   final_stats: 0
-  final_stats: 6756.5525
-  final_stats: 35
-  final_stats: 68
-  final_stats: 68
-  final_stats: 68
-  final_stats: 83
-  final_stats: 494
+  final_stats: 6421.96
+  final_stats: 27
+  final_stats: 99
+  final_stats: 60
+  final_stats: 60
+  final_stats: 75
+  final_stats: 384
   final_stats: 0
-  final_stats: 35
+  final_stats: 65
   final_stats: 0
  }
 }
@@ -347,18 +347,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -8.89808
+  weights: -0.57116
+  weights: 0
+  weights: 1.4203
   weights: 0
-  weights: -6.52842
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
+  weights: -6.49029
   weights: 0
-  weights: 65.96471
-  weights: 9.9427
   weights: 0
   weights: 0
   weights: 0
@@ -582,119 +582,119 @@ dps_results: {
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 1366.34624
-  tps: 1223.0551
+  dps: 1420.5702
+  tps: 1273.92502
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-DeathmistRaiment"
  value: {
-  dps: 365.06195
-  tps: 194.58953
+  dps: 373.59282
+  tps: 199.37095
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 1356.12301
-  tps: 1215.26636
+  dps: 1408.88313
+  tps: 1263.72093
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-InfernalPactEssence-216509"
  value: {
-  dps: 2135.69745
-  tps: 1923.93406
+  dps: 2368.81284
+  tps: 2147.05924
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-IronweaveBattlesuit"
  value: {
-  dps: 362.25999
-  tps: 198.40019
+  dps: 371.25717
+  tps: 203.38174
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 1366.34624
-  tps: 1223.0551
+  dps: 1420.5702
+  tps: 1273.92502
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1814.39592
-  tps: 1667.00953
+  dps: 1901.87959
+  tps: 1751.54065
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-NightmareProphet'sGarb"
  value: {
-  dps: 1785.17829
-  tps: 1635.76336
+  dps: 1874.98851
+  tps: 1724.0765
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-AllItems-ZilaGular-223214"
  value: {
-  dps: 2130.50808
-  tps: 1918.71186
+  dps: 2356.64418
+  tps: 2136.73518
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-Average-Default"
  value: {
-  dps: 2183.55393
-  tps: 1969.47483
+  dps: 2380.77151
+  tps: 2158.66158
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-Settings-Orc-destruction-Destruction Warlock-destruction-FullBuffs-Phase 4 Consumes-LongMultiTarget"
  value: {
-  dps: 2171.61561
-  tps: 2927.60324
+  dps: 2345.55047
+  tps: 3134.96417
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-Settings-Orc-destruction-Destruction Warlock-destruction-FullBuffs-Phase 4 Consumes-LongSingleTarget"
  value: {
-  dps: 2171.61561
-  tps: 1958.06689
+  dps: 2345.55047
+  tps: 2124.68095
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-Settings-Orc-destruction-Destruction Warlock-destruction-FullBuffs-Phase 4 Consumes-ShortSingleTarget"
  value: {
-  dps: 2337.52412
-  tps: 2155.30384
+  dps: 2488.84462
+  tps: 2267.1156
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-Settings-Orc-destruction-Destruction Warlock-destruction-NoBuffs-Phase 4 Consumes-LongMultiTarget"
  value: {
-  dps: 1148.24449
-  tps: 2066.87959
+  dps: 1448.47347
+  tps: 2420.22074
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-Settings-Orc-destruction-Destruction Warlock-destruction-NoBuffs-Phase 4 Consumes-LongSingleTarget"
  value: {
-  dps: 1148.24449
-  tps: 1022.87058
+  dps: 1448.47347
+  tps: 1299.89198
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-Settings-Orc-destruction-Destruction Warlock-destruction-NoBuffs-Phase 4 Consumes-ShortSingleTarget"
  value: {
-  dps: 1183.86288
-  tps: 1061.02806
+  dps: 1490.97506
+  tps: 1342.94316
  }
 }
 dps_results: {
  key: "TestDestruction-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2159.00022
-  tps: 1945.33737
+  dps: 2356.64418
+  tps: 2136.73518
  }
 }
diff --git a/sim/warlock/dps/dps_warlock_test.go b/sim/warlock/dps/dps_warlock_test.go
index f0a811a5c6..b1018d4920 100644
--- a/sim/warlock/dps/dps_warlock_test.go
+++ b/sim/warlock/dps/dps_warlock_test.go
@@ -248,7 +248,7 @@ var Phase4Consumes = core.ConsumesCombo{
 		FirePowerBuff:   proto.FirePowerBuff_ElixirOfGreaterFirepower,
 		ShadowPowerBuff: proto.ShadowPowerBuff_ElixirOfShadowPower,
 		Food:            proto.Food_FoodTenderWolfSteak,
-		MainHandImbue:   proto.WeaponImbue_BrillianWizardOil,
+		MainHandImbue:   proto.WeaponImbue_WizardOil,
 		SpellPowerBuff:  proto.SpellPowerBuff_GreaterArcaneElixir,
 	},
 }
diff --git a/sim/warlock/item_sets_pve.go b/sim/warlock/item_sets_pve.go
index 346d42a33f..462c447c94 100644
--- a/sim/warlock/item_sets_pve.go
+++ b/sim/warlock/item_sets_pve.go
@@ -252,6 +252,11 @@ var ItemSetWickedFelheart = core.NewItemSet(core.ItemSet{
 				},
 			})
 
+			icd := core.Cooldown{
+				Timer:    warlock.NewTimer(),
+				Duration: time.Millisecond * 100,
+			}
+
 			warlock.RegisterAura(core.Aura{
 				Label:    "S03 - Item - T1 - Warlock - Tank 6P Bonus",
 				Duration: core.NeverExpires,
@@ -259,8 +264,9 @@ var ItemSetWickedFelheart = core.NewItemSet(core.ItemSet{
 					aura.Activate(sim)
 				},
 				OnSpellHitDealt: func(aura *core.Aura, sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
-					if result.Landed() && spell.SpellCode == SpellCode_WarlockShadowCleave {
+					if result.Landed() && spell.SpellCode == SpellCode_WarlockShadowCleave && icd.IsReady(sim) && sim.Proc(0.2, "Soul Fire! Proc") {
 						procAura.Activate(sim)
+						icd.Use(sim)
 					}
 				},
 			})
diff --git a/ui/balance_druid/presets.ts b/ui/balance_druid/presets.ts
index 94abd2fad6..5f4f768010 100644
--- a/ui/balance_druid/presets.ts
+++ b/ui/balance_druid/presets.ts
@@ -126,7 +126,7 @@ export const DefaultRaidBuffs = RaidBuffs.create({
 	manaSpringTotem: TristateEffect.TristateEffectRegular,
 	moonkinAura: true,
 	powerWordFortitude: TristateEffect.TristateEffectImproved,
-	vampiricTouch: 50,
+	vampiricTouch: 300,
 });
 
 export const DefaultIndividualBuffs = IndividualBuffs.create({
diff --git a/ui/elemental_shaman/gear_sets/phase_4_burn.gear.json b/ui/elemental_shaman/gear_sets/phase_4.gear.json
similarity index 100%
rename from ui/elemental_shaman/gear_sets/phase_4_burn.gear.json
rename to ui/elemental_shaman/gear_sets/phase_4.gear.json
diff --git a/ui/elemental_shaman/presets.ts b/ui/elemental_shaman/presets.ts
index 2a05c9fc22..8107e3a52e 100644
--- a/ui/elemental_shaman/presets.ts
+++ b/ui/elemental_shaman/presets.ts
@@ -30,7 +30,7 @@ import Phase4APL from './apls/phase_4.apl.json';
 import Phase1Gear from './gear_sets/phase_1.gear.json';
 import Phase2Gear from './gear_sets/phase_2.gear.json';
 import Phase3Gear from './gear_sets/phase_3.gear.json';
-import Phase4GearBurn from './gear_sets/phase_4_burn.gear.json';
+import Phase4Gear from './gear_sets/phase_4.gear.json';
 
 // Preset options for this spec.
 // Eventually we will import these values for the raid sim too, so its good to
@@ -43,13 +43,13 @@ import Phase4GearBurn from './gear_sets/phase_4_burn.gear.json';
 export const GearPhase1 = PresetUtils.makePresetGear('Phase 1', Phase1Gear);
 export const GearPhase2 = PresetUtils.makePresetGear('Phase 2', Phase2Gear);
 export const GearPhase3 = PresetUtils.makePresetGear('Phase 3', Phase3Gear);
-export const GearPhase4Burn = PresetUtils.makePresetGear('Phase 4 Burn', Phase4GearBurn);
+export const GearPhase4 = PresetUtils.makePresetGear('Phase 4 Burn', Phase4Gear);
 
 export const GearPresets = {
 	[Phase.Phase1]: [GearPhase1],
 	[Phase.Phase2]: [GearPhase2],
 	[Phase.Phase3]: [GearPhase3],
-	[Phase.Phase4]: [GearPhase4Burn],
+	[Phase.Phase4]: [GearPhase4],
 	[Phase.Phase5]: [],
 };
 
@@ -129,7 +129,7 @@ export const DefaultRaidBuffs = RaidBuffs.create({
 	manaSpringTotem: TristateEffect.TristateEffectRegular,
 	moonkinAura: true,
 	strengthOfEarthTotem: TristateEffect.TristateEffectImproved,
-	vampiricTouch: 50,
+	vampiricTouch: 300,
 });
 
 export const DefaultIndividualBuffs = IndividualBuffs.create({
diff --git a/ui/enhancement_shaman/presets.ts b/ui/enhancement_shaman/presets.ts
index 6033022bfa..74c9ed02df 100644
--- a/ui/enhancement_shaman/presets.ts
+++ b/ui/enhancement_shaman/presets.ts
@@ -137,7 +137,7 @@ export const DefaultRaidBuffs = RaidBuffs.create({
 	leaderOfThePack: true,
 	manaSpringTotem: TristateEffect.TristateEffectRegular,
 	strengthOfEarthTotem: TristateEffect.TristateEffectImproved,
-	vampiricTouch: 50,
+	vampiricTouch: 300,
 });
 
 export const DefaultIndividualBuffs = IndividualBuffs.create({
diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts
index c562d45140..3185632cbf 100644
--- a/ui/mage/presets.ts
+++ b/ui/mage/presets.ts
@@ -259,7 +259,7 @@ export const DefaultRaidBuffs = RaidBuffs.create({
 	giftOfTheWild: TristateEffect.TristateEffectImproved,
 	manaSpringTotem: TristateEffect.TristateEffectRegular,
 	moonkinAura: true,
-	vampiricTouch: 50,
+	vampiricTouch: 300,
 });
 
 export const DefaultIndividualBuffs = IndividualBuffs.create({
diff --git a/ui/tank_warlock/gear_sets/p4_destro_tank.gear.json b/ui/tank_warlock/gear_sets/p4_destro_tank.gear.json
new file mode 100644
index 0000000000..5ab58c0eaa
--- /dev/null
+++ b/ui/tank_warlock/gear_sets/p4_destro_tank.gear.json
@@ -0,0 +1,21 @@
+{
+  "items": [
+    {"id":226917,"enchant":1507,"rune":427713},
+    {"id":228289},
+    {"id":216925,"enchant":7325},
+    {"id":228100,"enchant":1889,"rune":440870},
+    {"id":226920,"enchant":1892,"rune":412727},
+    {"id":216920,"enchant":1886,"rune":412758},
+    {"id":216921,"enchant":1843,"rune":403789},
+    {"id":216919,"rune":426316},
+    {"id":216923,"enchant":1507,"rune":425463},
+    {"id":216918,"enchant":911,"rune":412798},
+    {"id":228268,"rune":442894},
+    {"id":228683,"rune":459312},
+    {"id":228686},
+    {"id":228293},
+    {"id":228382,"enchant":2504},
+    {"id":228548},
+    {"id":228262}
+  ]
+}
diff --git a/ui/tank_warlock/presets.ts b/ui/tank_warlock/presets.ts
index 1a31e7f2e4..d8c2b1ec19 100644
--- a/ui/tank_warlock/presets.ts
+++ b/ui/tank_warlock/presets.ts
@@ -36,32 +36,35 @@ import DestructionGearPhase1 from './gear_sets/p1.destro.tank.gear.json';
 import DemonologyGearPhase2 from './gear_sets/p2.demo.tank.gear.json';
 import DestructionGearPhase2 from './gear_sets/p2.destro.tank.gear.json';
 import TankGearPhase3 from './gear_sets/p3.destro.tank.gear.json';
+import DestroTankGearPhase4 from './gear_sets/p4_destro_tank.gear.json';
 
 ///////////////////////////////////////////////////////////////////////////
 //                                 Gear Presets
 ///////////////////////////////////////////////////////////////////////////
 
-export const GearAfflictionTankPhase1 = PresetUtils.makePresetGear('P1 Affliction', AfflictionGearPhase1, {
-	customCondition: player => player.getLevel() == 25,
+export const GearAfflictionTankPhase1 = PresetUtils.makePresetGear('P1 Aff', AfflictionGearPhase1, {
+	customCondition: player => player.getLevel() === 25,
 });
-export const GearDestructionTankPhase1 = PresetUtils.makePresetGear('P1 Destruction', DestructionGearPhase1, {
-	customCondition: player => player.getLevel() == 25,
+export const GearDestructionTankPhase1 = PresetUtils.makePresetGear('P1 Destro', DestructionGearPhase1, {
+	customCondition: player => player.getLevel() === 25,
 });
 
-export const GearDemonologyTankPhase2 = PresetUtils.makePresetGear('P2 Demonology', DemonologyGearPhase2, {
-	customCondition: player => player.getLevel() == 40,
+export const GearDemonologyTankPhase2 = PresetUtils.makePresetGear('P2 Demo', DemonologyGearPhase2, {
+	customCondition: player => player.getLevel() === 40,
 });
-export const GearDestructionTankPhase2 = PresetUtils.makePresetGear('P2 Destruction', DestructionGearPhase2, {
-	customCondition: player => player.getLevel() == 40,
+export const GearDestructionTankPhase2 = PresetUtils.makePresetGear('P2 Destro', DestructionGearPhase2, {
+	customCondition: player => player.getLevel() === 40,
 });
 
-export const GearTankPhase3 = PresetUtils.makePresetGear('P3 Destruction', TankGearPhase3, { customCondition: player => player.getLevel() == 50 });
+export const GearTankPhase3 = PresetUtils.makePresetGear('P3 Destro', TankGearPhase3, { customCondition: player => player.getLevel() === 50 });
+
+export const GearDestroTankPhase3 = PresetUtils.makePresetGear('P4 Destro', DestroTankGearPhase4, { customCondition: player => player.getLevel() === 60 });
 
 export const GearPresets = {
 	[Phase.Phase1]: [GearAfflictionTankPhase1, GearDestructionTankPhase1],
 	[Phase.Phase2]: [GearDemonologyTankPhase2, GearDestructionTankPhase2],
 	[Phase.Phase3]: [GearTankPhase3],
-	[Phase.Phase4]: [],
+	[Phase.Phase4]: [GearDestroTankPhase3],
 	[Phase.Phase5]: [],
 };
 
@@ -73,27 +76,29 @@ export const DefaultGear = GearTankPhase3;
 ///////////////////////////////////////////////////////////////////////////
 
 export const APLAfflictionTankPhase1 = PresetUtils.makePresetAPLRotation('P1 Affliction', Phase1AfflictionAPL, {
-	customCondition: player => player.getLevel() == 25,
+	customCondition: player => player.getLevel() === 25,
 });
 export const APLDestructionTankPhase1 = PresetUtils.makePresetAPLRotation('P1 Destruction', Phase1DestroTankAPL, {
-	customCondition: player => player.getLevel() == 25,
+	customCondition: player => player.getLevel() === 25,
 });
 
 export const APLDemonologyTankPhase2 = PresetUtils.makePresetAPLRotation('P2 Demonology', Phase2DemonologyAPL, {
-	customCondition: player => player.getLevel() == 40,
+	customCondition: player => player.getLevel() === 40,
 });
 export const APLDestructionTankPhase2 = PresetUtils.makePresetAPLRotation('P2 Destruction', Phase2DestroTankAPL, {
-	customCondition: player => player.getLevel() == 40,
+	customCondition: player => player.getLevel() === 40,
 });
 
 export const APLTankPhase3 = PresetUtils.makePresetAPLRotation('P3 Destruction', Phase3TankAPL, {
-	customCondition: player => player.getLevel() == 50,
+	customCondition: player => player.getLevel() === 50,
 });
 
 export const APLPresets = {
 	[Phase.Phase1]: [APLAfflictionTankPhase1, APLDestructionTankPhase1],
 	[Phase.Phase2]: [APLDemonologyTankPhase2, APLDestructionTankPhase2],
 	[Phase.Phase3]: [APLTankPhase3],
+	[Phase.Phase4]: [],
+	[Phase.Phase5]: [],
 };
 
 export const DefaultAPLs: Record<number, Record<number, PresetUtils.PresetRotation>> = {
@@ -123,50 +128,58 @@ export const DefaultAPLs: Record<number, Record<number, PresetUtils.PresetRotati
 // https://wowhead.com/classic/talent-calc and copy the numbers in the url.
 
 export const TalentsAfflictionTankPhase1 = {
-	name: 'P1 Affliction',
+	name: 'Level 25 Aff',
 	data: SavedTalents.create({
 		talentsString: '050025001-003',
 	}),
-	enableWhen: (player: Player<any>) => player.getLevel() == 25,
+	enableWhen: (player: Player<any>) => player.getLevel() === 25,
 };
 
 export const TalentsDestructionTankPhase1 = {
-	name: 'P1 Destruction',
+	name: 'Level 25 Destro',
 	data: SavedTalents.create({
 		talentsString: '-03-0550201',
 	}),
-	enableWhen: (player: Player<any>) => player.getLevel() == 25,
+	enableWhen: (player: Player<any>) => player.getLevel() === 25,
 };
 
 export const TalentsDemonologyTankPhase2 = {
-	name: 'P2 Demonology',
+	name: 'Level 40 Demo',
 	data: SavedTalents.create({
 		talentsString: '-2050033112501251',
 	}),
-	enableWhen: (player: Player<any>) => player.getLevel() == 40,
+	enableWhen: (player: Player<any>) => player.getLevel() === 40,
 };
 
 export const TalentsDestructionTankPhase2 = {
-	name: 'P2 Destruction',
+	name: 'Level 40 Destro',
 	data: SavedTalents.create({
 		talentsString: '-035-05500050025001',
 	}),
-	enableWhen: (player: Player<any>) => player.getLevel() == 40,
+	enableWhen: (player: Player<any>) => player.getLevel() === 40,
 };
 
 export const TalentsTankPhase3 = {
-	name: 'P3 Destruction',
+	name: 'Level 50 Destro',
 	data: SavedTalents.create({
 		talentsString: '05-03-505020500050515',
 	}),
-	enableWhen: (player: Player<any>) => player.getLevel() == 50,
+	enableWhen: (player: Player<any>) => player.getLevel() === 50,
+};
+
+export const TalentsDestroTankPhase4 = {
+	name: 'Level 60 Destro',
+	data: SavedTalents.create({
+		talentsString: '4-035-5350205020505151',
+	}),
+	enableWhen: (player: Player<any>) => player.getLevel() === 60,
 };
 
 export const TalentPresets = {
 	[Phase.Phase1]: [TalentsAfflictionTankPhase1, TalentsDestructionTankPhase1],
 	[Phase.Phase2]: [TalentsDemonologyTankPhase2, TalentsDestructionTankPhase2],
 	[Phase.Phase3]: [TalentsTankPhase3],
-	[Phase.Phase4]: [],
+	[Phase.Phase4]: [TalentsDestroTankPhase4],
 	[Phase.Phase5]: [],
 };
 
diff --git a/ui/tank_warlock/sim.ts b/ui/tank_warlock/sim.ts
index 76a1b7ee94..73e55071db 100644
--- a/ui/tank_warlock/sim.ts
+++ b/ui/tank_warlock/sim.ts
@@ -131,12 +131,27 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecTankWarlock, {
 
 	presets: {
 		// Preset talents that the user can quickly select.
-		talents: [...Presets.TalentPresets[Phase.Phase3], ...Presets.TalentPresets[Phase.Phase2], ...Presets.TalentPresets[Phase.Phase1]],
+		talents: [
+			...Presets.TalentPresets[Phase.Phase4],
+			...Presets.TalentPresets[Phase.Phase3],
+			...Presets.TalentPresets[Phase.Phase2],
+			...Presets.TalentPresets[Phase.Phase1],
+		],
 		// Preset rotations that the user can quickly select.
-		rotations: [...Presets.APLPresets[Phase.Phase3], ...Presets.APLPresets[Phase.Phase2], ...Presets.APLPresets[Phase.Phase1]],
+		rotations: [
+			...Presets.APLPresets[Phase.Phase4],
+			...Presets.APLPresets[Phase.Phase3],
+			...Presets.APLPresets[Phase.Phase2],
+			...Presets.APLPresets[Phase.Phase1],
+		],
 
 		// Preset gear configurations that the user can quickly select.
-		gear: [...Presets.GearPresets[Phase.Phase3], ...Presets.GearPresets[Phase.Phase2], ...Presets.GearPresets[Phase.Phase1]],
+		gear: [
+			...Presets.GearPresets[Phase.Phase4],
+			...Presets.GearPresets[Phase.Phase3],
+			...Presets.GearPresets[Phase.Phase2],
+			...Presets.GearPresets[Phase.Phase1],
+		],
 	},
 
 	autoRotation: player => {
diff --git a/ui/warlock/apls/p4/affliction.apl.json b/ui/warlock/apls/p4/affliction.apl.json
index 24f6a640cc..cb01cf80e7 100644
--- a/ui/warlock/apls/p4/affliction.apl.json
+++ b/ui/warlock/apls/p4/affliction.apl.json
@@ -1,27 +1,24 @@
 {
   "type": "TypeAPL",
   "prepullActions": [
-    {"action":{"activateAura":{"auraId":{"spellId":18288}}},"doAtValue":{"const":{"val":"-5s"}}},
+    {"action":{"castSpell":{"spellId":{"spellId":18288}}},"doAtValue":{"const":{"val":"-5s"}}},
     {"action":{"castSpell":{"spellId":{"spellId":11661,"rank":9}}},"doAtValue":{"const":{"val":"-2.5"}}}
   ],
   "priorityList": [
     {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"75%"}}}}]}},"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}}},
     {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"15s"}}}},{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"65%"}}}}]}},"castSpell":{"spellId":{"itemId":12662}}}},
-    {"action":{"condition":{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11713,"rank":6}}}}},"multidot":{"spellId":{"spellId":11713,"rank":6},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}},
-    {"hide":true,"action":{"condition":{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":11717,"rank":4}}}}},"castSpell":{"spellId":{"spellId":11717,"rank":4}}}},
-    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"1.5"}}}},"castSpell":{"spellId":{"spellId":18871,"rank":6}}}},
-    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3.5"}}}},"castSpell":{"spellId":{"spellId":17923,"rank":6}}}},
+    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"0.5s"}}}},"castSpell":{"spellId":{"spellId":18871,"rank":6}}}},
+    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"3.5s"}}}},"channelSpell":{"spellId":{"spellId":11675,"rank":4},"interruptIf":{"gcdIsReady":{}}}}},
+    {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10s"}}}},{"auraIsActive":{"auraId":{"spellId":426311}}},{"warlockShouldRefreshCorruption":{}}]}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10s"}}}},{"warlockShouldRefreshCorruption":{}}]}}]}},"autocastOtherCooldowns":{}}},
+    {"action":{"condition":{"or":{"vals":[{"and":{"vals":[{"cmp":{"op":"OpLe","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10s"}}}},{"auraIsActive":{"auraId":{"spellId":426311}}},{"warlockShouldRefreshCorruption":{}}]}},{"and":{"vals":[{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"10s"}}}},{"warlockShouldRefreshCorruption":{}}]}}]}},"castSpell":{"spellId":{"spellId":11672,"rank":6}}}},
     {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"warlockCurrentPetMana":{}},"rhs":{"const":{"val":"800"}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":11689,"rank":6}}}},
+    {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":11713,"rank":6},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}},
     {"action":{"castSpell":{"spellId":{"spellId":403501}}}},
+    {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":427717},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}},
+    {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":11700,"rank":6},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}},
     {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":426320},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}},
     {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":11672,"rank":6},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}},
-    {"hide":true,"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":11700,"rank":6},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}},
-    {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}},"multidot":{"spellId":{"spellId":427717},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}},
-    {"action":{"condition":{"and":{"vals":[{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":403501}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"6s"}}}}]}},"multidot":{"spellId":{"spellId":18881,"rank":4},"maxDots":1,"maxOverlap":{"const":{"val":"0ms"}}}}},
-    {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":17941}}},"castSpell":{"spellId":{"spellId":11661,"rank":9}}}},
-    {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":403511}}},{"warlockShouldRecastDrainSoul":{}}]}},"channelSpell":{"spellId":{"spellId":11675,"rank":4},"interruptIf":{}}}},
-    {"hide":true,"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":403511}}},{"isExecutePhase":{"threshold":"E20"}}]}},"channelSpell":{"spellId":{"spellId":11675,"rank":4},"interruptIf":{"const":{"val":"true"}}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":11661,"rank":9}}}},
-    {"action":{"castSpell":{"spellId":{"spellId":11689,"rank":6}}}}
+    {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"10%"}}}},"castSpell":{"spellId":{"spellId":11689,"rank":6}}}},
+    {"action":{"castSpell":{"spellId":{"spellId":11661,"rank":9}}}}
   ]
 }
diff --git a/ui/warlock/gear_sets/p4/affliction.gear.json b/ui/warlock/gear_sets/p4/affliction.gear.json
index a4289a5b79..c433bbc124 100644
--- a/ui/warlock/gear_sets/p4/affliction.gear.json
+++ b/ui/warlock/gear_sets/p4/affliction.gear.json
@@ -1,21 +1,21 @@
 {
   "items": [
-    {"id":226909,"enchant":1509,"rune":427712},
-    {"id":228536},
-    {"id":228520,"enchant":7325},
-    {"id":220611,"rune":403511},
-    {"id":220535,"enchant":928,"rune":412727},
-    {"id":19595,"enchant":1883,"rune":427717},
-    {"id":226911,"rune":403501},
+    {"id":226549,"enchant":2544,"rune":427712},
+    {"id":228289},
+    {"id":226550,"enchant":7325},
+    {"id":227869,"enchant":2463,"rune":403511},
+    {"id":226548,"enchant":1891,"rune":403668},
+    {"id":226553,"enchant":1884,"rune":427717},
+    {"id":226552,"rune":403501},
     {"id":226905,"rune":426316},
-    {"id":22342,"enchant":1509,"rune":425464},
+    {"id":226547,"enchant":2544,"rune":412689},
     {"id":226908,"enchant":911,"rune":426320},
-    {"id":228683,"rune":442894},
-    {"id":228085,"rune":442897},
-    {"id":18467},
-    {"id":12930},
-    {"id":220586},
+    {"id":228287,"rune":442897},
+    {"id":228687,"rune":442894},
+    {"id":228255},
+    {"id":223214},
+    {"id":228269,"enchant":2504},
     {"id":220598},
-    {"id":220604}
+    {"id":13396}
   ]
 }
diff --git a/ui/warlock/gear_sets/p4/destruction.gear.json b/ui/warlock/gear_sets/p4/destruction.gear.json
index 713bf1d37e..ef139bdf86 100644
--- a/ui/warlock/gear_sets/p4/destruction.gear.json
+++ b/ui/warlock/gear_sets/p4/destruction.gear.json
@@ -1,20 +1,20 @@
 {
   "items": [
-    {"id":226909,"enchant":1509,"rune":427713},
-    {"id":228536},
-    {"id":226912,"enchant":7325},
-    {"id":22330,"rune":440870},
-    {"id":220535,"enchant":928,"rune":412727},
-    {"id":220538,"enchant":1883,"rune":412758},
-    {"id":226911,"rune":403629},
-    {"id":226905,"rune":426316},
-    {"id":226910,"enchant":1509,"rune":425464},
-    {"id":226908,"enchant":911,"rune":412732},
+    {"id":226909,"enchant":2544,"rune":427713},
+    {"id":228289},
+    {"id":227808,"enchant":7325},
+    {"id":22330,"enchant":2463,"rune":440870},
+    {"id":226548,"enchant":1891,"rune":412727},
+    {"id":226553,"enchant":1884,"rune":412758},
+    {"id":226552,"rune":403629},
+    {"id":228190,"rune":426316},
+    {"id":226547,"enchant":2544,"rune":425464},
+    {"id":226908,"enchant":911,"rune":440892},
+    {"id":228287,"rune":442897},
     {"id":228683,"rune":442894},
-    {"id":12926,"randomSuffix":176,"rune":442897},
-    {"id":12930},
     {"id":223195},
-    {"id":220586},
+    {"id":228255},
+    {"id":228269,"enchant":2504},
     {"id":19311},
     {"id":220604}
   ]
diff --git a/ui/warlock/presets.ts b/ui/warlock/presets.ts
index b11c7d07cb..356b05ad5b 100644
--- a/ui/warlock/presets.ts
+++ b/ui/warlock/presets.ts
@@ -2,6 +2,7 @@ import { Phase } from '../core/constants/other.js';
 import { Player } from '../core/player.js';
 import * as PresetUtils from '../core/preset_utils.js';
 import {
+	Alcohol,
 	Conjured,
 	Consumes,
 	Debuffs,
@@ -11,6 +12,7 @@ import {
 	Flask,
 	Food,
 	IndividualBuffs,
+	ManaRegenElixir,
 	Potions,
 	Profession,
 	RaidBuffs,
@@ -195,7 +197,7 @@ export const AffTalentsPhase3 = {
 };
 export const DestroTalentsPhase3 = {
 	name: 'P4 Destro',
-	data: SavedTalents.create({ talentsString: '05002-035004-5050205102005151' }),
+	data: SavedTalents.create({ talentsString: '05002-035-5250205122005151' }),
 	enableWhen: (player: Player<any>) => player.getLevel() == 60,
 };
 
@@ -226,46 +228,50 @@ export const DefaultOptions = WarlockOptions.create({
 });
 
 export const DefaultConsumes = Consumes.create({
+	alcohol: Alcohol.AlcoholKreegsStoutBeatdown,
 	defaultPotion: Potions.MajorManaPotion,
 	defaultConjured: Conjured.ConjuredDemonicRune,
 	enchantedSigil: EnchantedSigil.LivingDreamsSigil,
 	flask: Flask.FlaskOfSupremePower,
 	firePowerBuff: FirePowerBuff.ElixirOfGreaterFirepower,
 	food: Food.FoodTenderWolfSteak,
-	mainHandImbue: WeaponImbue.BrillianWizardOil,
+	mainHandImbue: WeaponImbue.WizardOil,
+	manaRegenElixir: ManaRegenElixir.MagebloodPotion,
 	spellPowerBuff: SpellPowerBuff.GreaterArcaneElixir,
 	shadowPowerBuff: ShadowPowerBuff.ElixirOfShadowPower,
-	zanzaBuff: ZanzaBuff.AtalaiMojoOfForbiddenMagic,
+	zanzaBuff: ZanzaBuff.GizzardGum,
 });
 
 export const DefaultRaidBuffs = RaidBuffs.create({
 	arcaneBrilliance: true,
 	aspectOfTheLion: true,
-	battleShout: TristateEffect.TristateEffectImproved,
+	demonicPact: 80,
 	divineSpirit: true,
 	giftOfTheWild: TristateEffect.TristateEffectImproved,
 	manaSpringTotem: TristateEffect.TristateEffectRegular,
 	moonkinAura: true,
 	powerWordFortitude: TristateEffect.TristateEffectImproved,
+	vampiricTouch: 300,
 });
 
 export const DefaultIndividualBuffs = IndividualBuffs.create({
-	blessingOfKings: true,
-	blessingOfMight: TristateEffect.TristateEffectImproved,
 	blessingOfWisdom: TristateEffect.TristateEffectImproved,
-	mightOfStormwind: true,
 	dragonslayerBuff: DragonslayerBuff.RallyingCryofTheDragonslayer,
+	mightOfStormwind: true,
+	moldarsMoxie: true,
 	saygesFortune: SaygesFortune.SaygesDamage,
+	slipkiksSavvy: true,
 	songflowerSerenade: true,
 	warchiefsBlessing: true,
 });
 
 export const DefaultDebuffs = Debuffs.create({
-	curseOfElements: true,
-	curseOfShadow: true,
 	faerieFire: true,
 	homunculi: 100,
+	improvedFaerieFire: true,
 	improvedScorch: true,
+	judgementOfWisdom: true,
+	markOfChaos: true,
 	occultPoison: true,
 	shadowWeaving: true,
 });