diff --git a/sim/warlock/TestAffliction.results b/sim/warlock/TestAffliction.results
index de690b4922..fe16a740ea 100644
--- a/sim/warlock/TestAffliction.results
+++ b/sim/warlock/TestAffliction.results
@@ -3,25 +3,25 @@ character_stats_results: {
  value: {
   final_stats: 320.1
   final_stats: 322.3
-  final_stats: 1627.45
-  final_stats: 1381.6
-  final_stats: 1017.5
-  final_stats: 3914.25
+  final_stats: 1705.55
+  final_stats: 1566.4
+  final_stats: 946
+  final_stats: 4120.8
   final_stats: 109
-  final_stats: 367.696
-  final_stats: 1277.0348
-  final_stats: 632
+  final_stats: 369.696
+  final_stats: 1480.93981
+  final_stats: 745
   final_stats: 0
   final_stats: 1195.81
-  final_stats: 289
-  final_stats: 818.55
-  final_stats: 572
+  final_stats: 291
+  final_stats: 971.55
+  final_stats: 685
   final_stats: 0
   final_stats: 0
-  final_stats: 24300
+  final_stats: 27072
   final_stats: 0
   final_stats: 0
-  final_stats: 5593.1
+  final_stats: 5678.1
   final_stats: 843.7
   final_stats: 0
   final_stats: 0
@@ -29,7 +29,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 23438.5
+  final_stats: 24219.5
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -46,357 +46,357 @@ character_stats_results: {
 dps_results: {
  key: "TestAffliction-AllItems-AshtongueTalismanofShadows-32493"
  value: {
-  dps: 9814.28798
-  tps: 8824.21102
+  dps: 10897.96238
+  tps: 9791.67435
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 9702.74433
-  tps: 8707.37197
+  dps: 10739.45857
+  tps: 9627.24072
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 9719.47499
-  tps: 8724.10262
+  dps: 10762.76948
+  tps: 9650.55163
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 9751.29892
-  tps: 8753.53236
+  dps: 10798.143
+  tps: 9683.00571
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 9890.83939
-  tps: 8895.46703
+  dps: 10971.4367
+  tps: 9859.21885
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DarkCoven'sRegalia"
  value: {
-  dps: 9618.35458
-  tps: 8619.70031
+  dps: 10126.05968
+  tps: 9120.94549
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DeathbringerGarb"
  value: {
-  dps: 8905.91708
-  tps: 7950.16543
+  dps: 9397.69922
+  tps: 8423.77947
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 9722.60081
-  tps: 8727.22844
+  dps: 10766.89819
+  tps: 9654.68034
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 9702.74433
-  tps: 8707.37197
+  dps: 10739.45857
+  tps: 9627.24072
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 9751.29892
-  tps: 8753.53236
+  dps: 10798.143
+  tps: 9683.00571
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 9719.47499
-  tps: 8724.10262
+  dps: 10762.76948
+  tps: 9650.55163
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 9713.50786
-  tps: 8718.1355
+  dps: 10758.0418
+  tps: 9645.82394
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 9702.74433
-  tps: 8707.37197
+  dps: 10739.45857
+  tps: 9627.24072
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 9751.29892
-  tps: 8753.53236
+  dps: 10798.143
+  tps: 9683.00571
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 9740.47337
-  tps: 8743.57751
+  dps: 10781.12263
+  tps: 9666.99447
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Gladiator'sFelshroud"
  value: {
-  dps: 8888.01953
-  tps: 7917.11061
+  dps: 9254.56378
+  tps: 8303.31748
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-Gul'dan'sRegalia"
  value: {
-  dps: 8870.45968
-  tps: 7819.88928
+  dps: 9294.63609
+  tps: 8235.81254
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 9719.47499
-  tps: 8724.10262
+  dps: 10762.76948
+  tps: 9650.55163
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 9713.50786
-  tps: 8718.1355
+  dps: 10758.0418
+  tps: 9645.82394
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 9706.39517
-  tps: 8707.49943
+  dps: 10756.15523
+  tps: 9642.97833
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 9702.74433
-  tps: 8707.37197
+  dps: 10739.45857
+  tps: 9627.24072
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-MaleficRaiment"
  value: {
-  dps: 6826.12653
-  tps: 5974.16967
+  dps: 7114.804
+  tps: 6257.87204
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 9702.74433
-  tps: 8707.37197
+  dps: 10739.45857
+  tps: 9627.24072
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 9702.74433
-  tps: 8707.37197
+  dps: 10739.45857
+  tps: 9627.24072
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PlagueheartGarb"
  value: {
-  dps: 8485.93781
-  tps: 7550.66456
+  dps: 8859.53801
+  tps: 7913.42675
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 9702.74433
-  tps: 8707.37197
+  dps: 10739.45857
+  tps: 9627.24072
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 9702.74433
-  tps: 8707.37197
+  dps: 10739.45857
+  tps: 9627.24072
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 9872.60298
-  tps: 8877.23061
+  dps: 10946.02781
+  tps: 9833.80996
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 9707.26602
-  tps: 8707.53505
+  dps: 10747.34907
+  tps: 9632.62924
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 9702.74433
-  tps: 8707.37197
+  dps: 10739.45857
+  tps: 9627.24072
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 9702.74433
-  tps: 8707.37197
+  dps: 10739.45857
+  tps: 9627.24072
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 9702.74433
-  tps: 8707.37197
+  dps: 10739.45857
+  tps: 9627.24072
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 9702.74433
-  tps: 8707.37197
+  dps: 10739.45857
+  tps: 9627.24072
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 9751.29892
-  tps: 8753.53236
+  dps: 10798.143
+  tps: 9683.00571
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 9740.47337
-  tps: 8743.57751
+  dps: 10781.12263
+  tps: 9666.99447
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 9740.47337
-  tps: 8743.57751
+  dps: 10781.12263
+  tps: 9666.99447
  }
 }
 dps_results: {
  key: "TestAffliction-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 9751.29892
-  tps: 8753.53236
+  dps: 10798.143
+  tps: 9683.00571
  }
 }
 dps_results: {
  key: "TestAffliction-Average-Default"
  value: {
-  dps: 9989.19077
-  tps: 8991.30281
+  dps: 11041.26415
+  tps: 9919.43393
  }
 }
 dps_results: {
- key: "TestAffliction-Settings-Orc-P2-AffItemSwap-FullBuffs-LongMultiTarget"
+ key: "TestAffliction-Settings-Orc-P3-AffItemSwap-FullBuffs-LongMultiTarget"
  value: {
-  dps: 26829.42678
-  tps: 31672.76187
+  dps: 28895.69763
+  tps: 33545.81277
  }
 }
 dps_results: {
- key: "TestAffliction-Settings-Orc-P2-AffItemSwap-FullBuffs-LongSingleTarget"
+ key: "TestAffliction-Settings-Orc-P3-AffItemSwap-FullBuffs-LongSingleTarget"
  value: {
-  dps: 9913.59823
-  tps: 8916.52744
+  dps: 11004.1631
+  tps: 9890.8304
  }
 }
 dps_results: {
- key: "TestAffliction-Settings-Orc-P2-AffItemSwap-FullBuffs-ShortSingleTarget"
+ key: "TestAffliction-Settings-Orc-P3-AffItemSwap-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 10621.2753
-  tps: 9575.28576
+  dps: 11798.3383
+  tps: 10636.11836
  }
 }
 dps_results: {
- key: "TestAffliction-Settings-Orc-P2-AffItemSwap-NoBuffs-LongMultiTarget"
+ key: "TestAffliction-Settings-Orc-P3-AffItemSwap-NoBuffs-LongMultiTarget"
  value: {
-  dps: 16048.33362
-  tps: 21047.37708
+  dps: 17164.14801
+  tps: 22134.56933
  }
 }
 dps_results: {
- key: "TestAffliction-Settings-Orc-P2-AffItemSwap-NoBuffs-LongSingleTarget"
+ key: "TestAffliction-Settings-Orc-P3-AffItemSwap-NoBuffs-LongSingleTarget"
  value: {
-  dps: 5680.95253
-  tps: 5344.29601
+  dps: 6330.47139
+  tps: 5930.61924
  }
 }
 dps_results: {
- key: "TestAffliction-Settings-Orc-P2-AffItemSwap-NoBuffs-ShortSingleTarget"
+ key: "TestAffliction-Settings-Orc-P3-AffItemSwap-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5505.39915
-  tps: 5094.96055
+  dps: 6046.38053
+  tps: 5572.82006
  }
 }
 dps_results: {
- key: "TestAffliction-Settings-Orc-P2-Affliction Warlock-FullBuffs-LongMultiTarget"
+ key: "TestAffliction-Settings-Orc-P3-Affliction Warlock-FullBuffs-LongMultiTarget"
  value: {
-  dps: 29448.88006
-  tps: 34224.64373
+  dps: 31731.9303
+  tps: 36574.22243
  }
 }
 dps_results: {
- key: "TestAffliction-Settings-Orc-P2-Affliction Warlock-FullBuffs-LongSingleTarget"
+ key: "TestAffliction-Settings-Orc-P3-Affliction Warlock-FullBuffs-LongSingleTarget"
  value: {
-  dps: 9896.34779
-  tps: 8903.19526
+  dps: 10964.45306
+  tps: 9850.53721
  }
 }
 dps_results: {
- key: "TestAffliction-Settings-Orc-P2-Affliction Warlock-FullBuffs-ShortSingleTarget"
+ key: "TestAffliction-Settings-Orc-P3-Affliction Warlock-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 10641.52243
-  tps: 9599.45374
+  dps: 11737.93108
+  tps: 10572.57791
  }
 }
 dps_results: {
- key: "TestAffliction-Settings-Orc-P2-Affliction Warlock-NoBuffs-LongMultiTarget"
+ key: "TestAffliction-Settings-Orc-P3-Affliction Warlock-NoBuffs-LongMultiTarget"
  value: {
-  dps: 17514.33318
-  tps: 22592.62225
+  dps: 18948.06867
+  tps: 24120.61716
  }
 }
 dps_results: {
- key: "TestAffliction-Settings-Orc-P2-Affliction Warlock-NoBuffs-LongSingleTarget"
+ key: "TestAffliction-Settings-Orc-P3-Affliction Warlock-NoBuffs-LongSingleTarget"
  value: {
-  dps: 5682.59248
-  tps: 5346.9495
+  dps: 6339.64885
+  tps: 5941.34035
  }
 }
 dps_results: {
- key: "TestAffliction-Settings-Orc-P2-Affliction Warlock-NoBuffs-ShortSingleTarget"
+ key: "TestAffliction-Settings-Orc-P3-Affliction Warlock-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5531.42207
-  tps: 5117.91325
+  dps: 6112.48491
+  tps: 5637.1738
  }
 }
 dps_results: {
  key: "TestAffliction-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 9849.9465
-  tps: 8895.46703
+  dps: 10931.01845
+  tps: 9859.21885
  }
 }
diff --git a/sim/warlock/TestDemonology.results b/sim/warlock/TestDemonology.results
index b02b3cf74d..53cf137156 100644
--- a/sim/warlock/TestDemonology.results
+++ b/sim/warlock/TestDemonology.results
@@ -3,25 +3,25 @@ character_stats_results: {
  value: {
   final_stats: 320.1
   final_stats: 322.3
-  final_stats: 1820.445
-  final_stats: 1383.8
-  final_stats: 1167.1
-  final_stats: 4039.169
+  final_stats: 1878.525
+  final_stats: 1559.8
+  final_stats: 1337.6
+  final_stats: 4270.664
   final_stats: 109
-  final_stats: 374
-  final_stats: 1678.74081
-  final_stats: 650
+  final_stats: 370
+  final_stats: 1762.22177
+  final_stats: 725
   final_stats: 0
   final_stats: 1195.81
-  final_stats: 374
-  final_stats: 1219.65
-  final_stats: 410
+  final_stats: 370
+  final_stats: 1254.65
+  final_stats: 485
   final_stats: 0
   final_stats: 0
-  final_stats: 25062.99
+  final_stats: 27782.19
   final_stats: 0
   final_stats: 0
-  final_stats: 5593.1
+  final_stats: 5668.1
   final_stats: 843.7
   final_stats: 0
   final_stats: 0
@@ -29,7 +29,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 26129.5035
+  final_stats: 26727.7275
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -46,315 +46,315 @@ character_stats_results: {
 dps_results: {
  key: "TestDemonology-AllItems-AshtongueTalismanofShadows-32493"
  value: {
-  dps: 8924.23355
-  tps: 7491.72168
+  dps: 9877.45696
+  tps: 8247.98916
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 8943.43263
-  tps: 7500.79184
+  dps: 9765.89555
+  tps: 8133.18837
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 8947.13471
-  tps: 7505.31591
+  dps: 9777.91443
+  tps: 8146.01823
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 8972.91606
-  tps: 7526.5379
+  dps: 9791.31655
+  tps: 8154.77276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 9119.35839
-  tps: 7677.53959
+  dps: 9969.38276
+  tps: 8337.48656
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkCoven'sRegalia"
  value: {
-  dps: 9036.39588
-  tps: 7597.23994
+  dps: 9476.54974
+  tps: 8034.42838
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DeathbringerGarb"
  value: {
-  dps: 8331.53985
-  tps: 6948.52238
+  dps: 8711.48101
+  tps: 7324.59002
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 8949.03518
-  tps: 7507.21638
+  dps: 9780.15636
+  tps: 8148.26016
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 8943.43263
-  tps: 7500.79184
+  dps: 9765.89555
+  tps: 8133.18837
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 8972.91606
-  tps: 7526.5379
+  dps: 9791.31655
+  tps: 8154.77276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 8947.13471
-  tps: 7505.31591
+  dps: 9777.91443
+  tps: 8146.01823
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 8945.37944
-  tps: 7503.56064
+  dps: 9775.18588
+  tps: 8143.28968
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 8936.39772
-  tps: 7494.57892
+  dps: 9759.34195
+  tps: 8127.44575
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 8972.91606
-  tps: 7526.5379
+  dps: 9791.31655
+  tps: 8154.77276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 8964.87713
-  tps: 7519.93527
+  dps: 9785.67414
+  tps: 8150.07413
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Gladiator'sFelshroud"
  value: {
-  dps: 8409.39375
-  tps: 6996.82292
+  dps: 8610.13992
+  tps: 7196.09208
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Gul'dan'sRegalia"
  value: {
-  dps: 8399.92098
-  tps: 6892.98957
+  dps: 8721.46551
+  tps: 7214.64985
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 8947.13471
-  tps: 7505.31591
+  dps: 9777.91443
+  tps: 8146.01823
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 8945.37944
-  tps: 7503.56064
+  dps: 9775.18588
+  tps: 8143.28968
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 8942.07442
-  tps: 7499.83689
+  dps: 9782.17459
+  tps: 8149.11134
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 8936.39772
-  tps: 7494.57892
+  dps: 9759.34195
+  tps: 8127.44575
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MaleficRaiment"
  value: {
-  dps: 6623.97924
-  tps: 5413.84104
+  dps: 6835.55608
+  tps: 5629.80986
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 8936.39772
-  tps: 7494.57892
+  dps: 9759.34195
+  tps: 8127.44575
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 8936.39772
-  tps: 7494.57892
+  dps: 9759.34195
+  tps: 8127.44575
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PlagueheartGarb"
  value: {
-  dps: 8107.31565
-  tps: 6759.00306
+  dps: 8304.63578
+  tps: 6953.84895
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 8942.25632
-  tps: 7499.75437
+  dps: 9764.50739
+  tps: 8131.95227
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 8943.43263
-  tps: 7500.79184
+  dps: 9765.89555
+  tps: 8133.18837
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 9107.65507
-  tps: 7665.83627
+  dps: 9949.13876
+  tps: 8317.24256
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 8939.10745
-  tps: 7496.56059
+  dps: 9756.49457
+  tps: 8123.44764
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 8936.39772
-  tps: 7494.57892
+  dps: 9759.34195
+  tps: 8127.44575
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 8936.39772
-  tps: 7494.57892
+  dps: 9759.34195
+  tps: 8127.44575
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 8936.39772
-  tps: 7494.57892
+  dps: 9759.34195
+  tps: 8127.44575
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 8936.39772
-  tps: 7494.57892
+  dps: 9759.34195
+  tps: 8127.44575
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 8972.91606
-  tps: 7526.5379
+  dps: 9791.31655
+  tps: 8154.77276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 8964.87713
-  tps: 7519.93527
+  dps: 9785.67414
+  tps: 8150.07413
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 8964.87713
-  tps: 7519.93527
+  dps: 9785.67414
+  tps: 8150.07413
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 8972.91606
-  tps: 7526.5379
+  dps: 9791.31655
+  tps: 8154.77276
  }
 }
 dps_results: {
  key: "TestDemonology-Average-Default"
  value: {
-  dps: 9207.56977
-  tps: 7758.67475
+  dps: 10074.4434
+  tps: 8436.52247
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-FullBuffs-LongMultiTarget"
  value: {
-  dps: 32040.27418
-  tps: 36434.98947
+  dps: 34020.32864
+  tps: 38288.44556
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-FullBuffs-LongSingleTarget"
  value: {
-  dps: 9126.26788
-  tps: 7685.41695
+  dps: 9985.3488
+  tps: 8355.14099
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 10548.27663
-  tps: 8899.75437
+  dps: 11530.87492
+  tps: 9685.09216
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-NoBuffs-LongMultiTarget"
  value: {
-  dps: 19728.26317
-  tps: 25021.95983
+  dps: 21169.42707
+  tps: 26451.58966
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-NoBuffs-LongSingleTarget"
  value: {
-  dps: 5199.50283
-  tps: 4738.29599
+  dps: 5763.67487
+  tps: 5210.22066
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-P2-Demonology Warlock-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5471.31663
-  tps: 4888.56788
+  dps: 6127.58612
+  tps: 5457.69662
  }
 }
 dps_results: {
  key: "TestDemonology-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 8994.86919
-  tps: 7677.53959
+  dps: 9838.4347
+  tps: 8337.48656
  }
 }
diff --git a/sim/warlock/TestDestruction.results b/sim/warlock/TestDestruction.results
index 70278d6228..583e3a225f 100644
--- a/sim/warlock/TestDestruction.results
+++ b/sim/warlock/TestDestruction.results
@@ -3,25 +3,25 @@ character_stats_results: {
  value: {
   final_stats: 320.1
   final_stats: 322.3
-  final_stats: 1820.445
-  final_stats: 1383.8
-  final_stats: 1167.1
-  final_stats: 4039.169
+  final_stats: 1857.955
+  final_stats: 1553.2
+  final_stats: 1127.5
+  final_stats: 4319.725
   final_stats: 109
-  final_stats: 374
-  final_stats: 1406.37081
-  final_stats: 410
+  final_stats: 367
+  final_stats: 1639.03373
+  final_stats: 463
   final_stats: 0
   final_stats: 1195.81
-  final_stats: 374
-  final_stats: 760.55
-  final_stats: 410
+  final_stats: 367
+  final_stats: 946.55
+  final_stats: 463
   final_stats: 0
   final_stats: 0
-  final_stats: 25062.99
+  final_stats: 27680.22
   final_stats: 0
   final_stats: 0
-  final_stats: 5593.1
+  final_stats: 5655.1
   final_stats: 843.7
   final_stats: 0
   final_stats: 0
@@ -29,7 +29,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 27499.4035
+  final_stats: 27885.7565
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -46,315 +46,315 @@ character_stats_results: {
 dps_results: {
  key: "TestDestruction-AllItems-AshtongueTalismanofShadows-32493"
  value: {
-  dps: 9111.00396
-  tps: 7369.58879
+  dps: 10003.73223
+  tps: 8087.69383
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 9126.76565
-  tps: 7382.72098
+  dps: 9988.18551
+  tps: 8057.53495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 9144.4717
-  tps: 7398.66362
+  dps: 9999.48741
+  tps: 8067.70665
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 9167.33869
-  tps: 7417.01178
+  dps: 10030.12477
+  tps: 8092.87418
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 9392.52265
-  tps: 7621.90947
+  dps: 10294.81946
+  tps: 8333.5055
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DarkCoven'sRegalia"
  value: {
-  dps: 9048.91664
-  tps: 7320.78589
+  dps: 9628.61305
+  tps: 7827.28126
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DeathbringerGarb"
  value: {
-  dps: 8566.41295
-  tps: 6911.90213
+  dps: 9150.96326
+  tps: 7428.78913
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 9151.5324
-  tps: 7405.01824
+  dps: 10002.74763
+  tps: 8070.64085
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 9126.76565
-  tps: 7382.72098
+  dps: 9988.18551
+  tps: 8057.53495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 9167.33869
-  tps: 7417.01178
+  dps: 10030.12477
+  tps: 8092.87418
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 9144.4717
-  tps: 7398.66362
+  dps: 9999.48741
+  tps: 8067.70665
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 9141.71448
-  tps: 7396.18212
+  dps: 9996.32534
+  tps: 8064.86079
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 9126.76565
-  tps: 7382.72098
+  dps: 9988.18551
+  tps: 8057.53495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 9167.33869
-  tps: 7417.01178
+  dps: 10030.12477
+  tps: 8092.87418
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 9159.29022
-  tps: 7410.20849
+  dps: 10021.73692
+  tps: 8085.80633
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Gladiator'sFelshroud"
  value: {
-  dps: 8504.28635
-  tps: 6832.98717
+  dps: 8883.2959
+  tps: 7197.71942
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Gul'dan'sRegalia"
  value: {
-  dps: 8710.91438
-  tps: 6972.78991
+  dps: 9091.53175
+  tps: 7302.32904
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 9144.4717
-  tps: 7398.66362
+  dps: 9999.48741
+  tps: 8067.70665
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 9141.71448
-  tps: 7396.18212
+  dps: 9996.32534
+  tps: 8064.86079
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 9135.28735
-  tps: 7389.89099
+  dps: 9990.97849
+  tps: 8060.11298
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 9126.76565
-  tps: 7382.72098
+  dps: 9988.18551
+  tps: 8057.53495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MaleficRaiment"
  value: {
-  dps: 6730.18524
-  tps: 5347.11442
+  dps: 7076.27456
+  tps: 5641.36922
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 9126.76565
-  tps: 7382.72098
+  dps: 9988.18551
+  tps: 8057.53495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 9126.76565
-  tps: 7382.72098
+  dps: 9988.18551
+  tps: 8057.53495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PlagueheartGarb"
  value: {
-  dps: 8106.69495
-  tps: 6509.3986
+  dps: 8442.5207
+  tps: 6794.77823
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 9126.76565
-  tps: 7382.72098
+  dps: 9988.18551
+  tps: 8057.53495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 9126.76565
-  tps: 7382.72098
+  dps: 9988.18551
+  tps: 8057.53495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 9373.33434
-  tps: 7604.6328
+  dps: 10282.50039
+  tps: 8322.41834
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 9127.89453
-  tps: 7383.44673
+  dps: 9988.18551
+  tps: 8057.21379
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 9126.76565
-  tps: 7382.72098
+  dps: 9988.18551
+  tps: 8057.53495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 9126.76565
-  tps: 7382.72098
+  dps: 9988.18551
+  tps: 8057.53495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 9126.76565
-  tps: 7382.72098
+  dps: 9988.18551
+  tps: 8057.53495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 9126.76565
-  tps: 7382.72098
+  dps: 9988.18551
+  tps: 8057.53495
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 9167.33869
-  tps: 7417.01178
+  dps: 10030.12477
+  tps: 8092.87418
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 9159.29022
-  tps: 7410.20849
+  dps: 10021.73692
+  tps: 8085.80633
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 9159.29022
-  tps: 7410.20849
+  dps: 10021.73692
+  tps: 8085.80633
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 9167.33869
-  tps: 7417.01178
+  dps: 10030.12477
+  tps: 8092.87418
  }
 }
 dps_results: {
  key: "TestDestruction-Average-Default"
  value: {
-  dps: 9515.82422
-  tps: 7725.9832
+  dps: 10459.63971
+  tps: 8466.14233
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-P2-Destruction Warlock-FullBuffs-LongMultiTarget"
  value: {
-  dps: 22376.51722
-  tps: 26905.6487
+  dps: 23979.64708
+  tps: 28432.19611
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-P2-Destruction Warlock-FullBuffs-LongSingleTarget"
  value: {
-  dps: 9426.175
-  tps: 7653.44079
+  dps: 10329.19689
+  tps: 8365.09981
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-P2-Destruction Warlock-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 10678.5304
-  tps: 8690.38027
+  dps: 11792.06869
+  tps: 9555.54258
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-P2-Destruction Warlock-NoBuffs-LongMultiTarget"
  value: {
-  dps: 13081.16517
-  tps: 18081.52664
+  dps: 13987.01945
+  tps: 19003.3802
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-P2-Destruction Warlock-NoBuffs-LongSingleTarget"
  value: {
-  dps: 5132.70587
-  tps: 4336.74128
+  dps: 5786.62306
+  tps: 4861.58185
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-P2-Destruction Warlock-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5211.21887
-  tps: 4347.13208
+  dps: 5822.76927
+  tps: 4840.58964
  }
 }
 dps_results: {
  key: "TestDestruction-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 9392.52265
-  tps: 7621.90947
+  dps: 10294.81946
+  tps: 8333.5055
  }
 }
diff --git a/sim/warlock/warlock_test.go b/sim/warlock/warlock_test.go
index 78b7469f6e..67ab9aa6e9 100644
--- a/sim/warlock/warlock_test.go
+++ b/sim/warlock/warlock_test.go
@@ -16,7 +16,7 @@ func TestAffliction(t *testing.T) {
 		Class: proto.Class_ClassWarlock,
 		Race:  proto.Race_RaceOrc,
 
-		GearSet:     core.GearSetCombo{Label: "P2", GearSet: P2Gear_affliction},
+		GearSet:     core.GearSetCombo{Label: "P3", GearSet: P3Gear_affliction},
 		Talents:     AfflictionTalents,
 		Glyphs:      AfflictionGlyphs,
 		Consumes:    FullConsumes,
@@ -34,7 +34,7 @@ func TestDemonology(t *testing.T) {
 		Class: proto.Class_ClassWarlock,
 		Race:  proto.Race_RaceOrc,
 
-		GearSet:     core.GearSetCombo{Label: "P2", GearSet: P2Gear_demodestro},
+		GearSet:     core.GearSetCombo{Label: "P2", GearSet: P3Gear_demo},
 		Talents:     DemonologyTalents,
 		Glyphs:      DemonologyGlyphs,
 		Consumes:    FullConsumes,
@@ -49,7 +49,7 @@ func TestDestruction(t *testing.T) {
 		Class: proto.Class_ClassWarlock,
 		Race:  proto.Race_RaceOrc,
 
-		GearSet:     core.GearSetCombo{Label: "P2", GearSet: P2Gear_demodestro},
+		GearSet:     core.GearSetCombo{Label: "P2", GearSet: P3Gear_destro},
 		Talents:     DestructionTalents,
 		Glyphs:      DestructionGlyphs,
 		Consumes:    FullConsumes,
@@ -196,96 +196,95 @@ var FullConsumes = &proto.Consumes{
 	Food:          proto.Food_FoodFishFeast,
 }
 
-var P2Gear_affliction = core.EquipmentSpecFromJsonString(`{"items": [
+var P3Gear_affliction = core.EquipmentSpecFromJsonString(`{"items": [
 		{
-			"id": 45497,
+			"id": 47796,
 			"enchant": 3820,
 			"gems": [
 				41285,
-				45883
+				40133
 			]
 		},
 		{
-			"id": 45133,
+			"id": 47468,
 			"gems": [
-				40051
+				40155
 			]
 		},
 		{
-			"id": 46068,
+			"id": 47793,
 			"enchant": 3810,
 			"gems": [
-				39998,
-				40049
+				40155
 			]
 		},
 		{
-			"id": 45618,
+			"id": 47551,
 			"enchant": 3722,
 			"gems": [
-				40026
+				40113
 			]
 		},
 		{
-			"id": 46137,
+			"id": 47462,
 			"enchant": 1144,
 			"gems": [
-				39998,
-				40014
+				40133,
+				40155,
+				40113
 			]
 		},
 		{
-			"id": 45446,
+			"id": 47485,
 			"enchant": 2332,
 			"gems": [
-				39998,
+				40113,
 				0
 			]
 		},
 		{
-			"id": 45665,
+			"id": 47797,
 			"enchant": 3604,
 			"gems": [
-				39998,
-				39998,
+				40113,
 				0
 			]
 		},
 		{
-			"id": 45619,
-			"enchant": 3601,
+			"id": 47419,
+			"enchant": 3599,
 			"gems": [
-				40051,
-				40051,
-				39998
+				40133,
+				40113,
+				40113
 			]
 		},
 		{
-			"id": 46139,
+			"id": 47795,
 			"enchant": 3872,
 			"gems": [
-				39998,
-				39998
+				40113,
+				40153
 			]
 		},
 		{
-			"id": 45135,
+			"id": 47454,
 			"enchant": 3606,
 			"gems": [
-				39998,
-				40051
+				40133,
+				40113
 			]
 		},
 		{
 			"id": 45495,
 			"gems": [
-				40026
+				40113
 			]
 		},
 		{
-			"id": 46046,
+			"id": 47489,
 			"gems": [
-				39998
+				40155
 			]
 		},
 		{
@@ -295,14 +294,17 @@ var P2Gear_affliction = core.EquipmentSpecFromJsonString(`{"items": [
 			"id": 45466
 		},
 		{
-			"id": 45620,
+			"id": 47422,
 			"enchant": 3834,
 			"gems": [
-				39998
+				40113
 			]
 		},
 		{
-			"id": 45617
+			"id": 48032,
+			"gems": [
+				40155
+			]
 		},
 		{
 			"id": 45294,
@@ -312,116 +314,232 @@ var P2Gear_affliction = core.EquipmentSpecFromJsonString(`{"items": [
 		}
 ]}`)
 
-var P2Gear_demodestro = core.EquipmentSpecFromJsonString(`{"items": [
+var P3Gear_demo = core.EquipmentSpecFromJsonString(`{"items": [
 		{
-			"id": 45497,
+			"id": 47796,
 			"enchant": 3820,
 			"gems": [
 				41285,
-				45883
+				40133
 			]
 		},
 		{
-			"id": 45243,
+			"id": 45133,
 			"gems": [
-				39998
+				40153
 			]
 		},
 		{
-			"id": 46068,
-			"enchant": 3810, "gems": [ 39998,
-				40051
+			"id": 47793,
+			"enchant": 3810,
+			"gems": [
+				40113
 			]
 		},
 		{
-			"id": 45618,
+			"id": 47554,
 			"enchant": 3722,
 			"gems": [
-				40026
+				40113
 			]
 		},
 		{
-			"id": 46137,
+			"id": 47794,
 			"enchant": 1144,
 			"gems": [
-				39998,
-				40051
+				40113,
+				40133
+			]
+		},
+		{
+			"id": 47485,
+			"enchant": 2332,
+			"gems": [
+				40133,
+				0
+			]
+		},
+		{
+			"id": 47803,
+			"enchant": 3604,
+			"gems": [
+				40113,
+				0
+			]
+		},
+		{
+			"id": 47419,
+			"enchant": 3599,
+			"gems": [
+				40133,
+				40113,
+				40113
+			]
+		},
+		{
+			"id": 47435,
+			"enchant": 3872,
+			"gems": [
+				40113,
+				40133,
+				40133
+			]
+		},
+		{
+			"id": 47454,
+			"enchant": 3606,
+			"gems": [
+				40133,
+				40113
+			]
+		},
+		{
+			"id": 45495,
+			"gems": [
+				40133
+			]
+		},
+		{
+			"id": 47489,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 45518
+		},
+		{
+			"id": 40255
+		},
+		{
+			"id": 47422,
+			"enchant": 3834,
+			"gems": [
+				40133
+			]
+		},
+		{
+			"id": 47470
+		},
+		{
+			"id": 45294,
+			"gems": [
+				40113
+			]
+		}
+]}`)
+
+var P3Gear_destro = core.EquipmentSpecFromJsonString(`{"items": [
+		{
+			"id": 47695,
+			"enchant": 3820,
+			"gems": [
+				41285,
+				40155
+			]
+		},
+		{
+			"id": 47468,
+			"gems": [
+				40153
+			]
+		},
+		{
+			"id": 47793,
+			"enchant": 3810,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 47551,
+			"enchant": 3722,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 47794,
+			"enchant": 1144,
+			"gems": [
+				40113,
+				40133
 			]
 		},
 		{
-			"id": 45446,
+			"id": 47467,
 			"enchant": 2332,
 			"gems": [
-				39998,
+				40153,
 				0
 			]
 		},
 		{
-			"id": 45520,
+			"id": 47803,
 			"enchant": 3604,
 			"gems": [
-				39998,
-				39998,
+				40113,
 				0
 			]
 		},
 		{
-			"id": 45619,
-			"enchant": 3601,
+			"id": 47419,
+			"enchant": 3599,
 			"gems": [
-				39998,
-				39998,
-				39998
+				40133,
+				40113,
+				40113
 			]
 		},
 		{
-			"id": 46139,
+			"id": 47435,
 			"enchant": 3872,
 			"gems": [
-				39998,
-				39998
+				40113,
+				40133,
+				40133
 			]
 		},
 		{
-			"id": 45135,
+			"id": 47454,
 			"enchant": 3606,
 			"gems": [
-				39998,
-				39998
+				40133,
+				40113
 			]
 		},
 		{
 			"id": 45495,
 			"gems": [
-				40026
+				40133
 			]
 		},
 		{
-			"id": 45297,
+			"id": 47489,
 			"gems": [
-				39998
+				40155
 			]
 		},
 		{
 			"id": 45518
 		},
 		{
-			"id": 45148
+			"id": 47477
 		},
 		{
-			"id": 45620,
+			"id": 47422,
 			"enchant": 3834,
 			"gems": [
-				39998
+				40133
 			]
 		},
 		{
-			"id": 45617
+			"id": 47437
 		},
 		{
 			"id": 45294,
 			"gems": [
-				39998
+				40153
 			]
 		}
 ]}`)
diff --git a/ui/warlock/presets.ts b/ui/warlock/presets.ts
index 2829a8beb2..033a8005bc 100644
--- a/ui/warlock/presets.ts
+++ b/ui/warlock/presets.ts
@@ -10,6 +10,7 @@ import {
 	IndividualBuffs,
 	Debuffs,
 	TristateEffect,
+	Faction,
 	Spec,
 } from '../core/proto/common.js';
 import { SavedTalents } from '../core/proto/ui.js';
@@ -946,6 +947,735 @@ export const P2_Preset_Demo_Destro = {
 	]}`),
 }
 
+export const P3_Preset_Affliction_Horde = {
+	name: 'P3 Affliction H',
+	tooltip: WarlockTooltips.BIS_TOOLTIP,
+	enableWhen: (player: Player<Spec.SpecWarlock>) => player.getRotation().type == RotationType.Affliction && player.getFaction() == Faction.Horde,
+		gear: EquipmentSpec.fromJsonString(`{"items": [
+		{
+			"id": 47796,
+			"enchant": 3820,
+			"gems": [
+				41285,
+				40133
+			]
+		},
+		{
+			"id": 47468,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 47793,
+			"enchant": 3810,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 47551,
+			"enchant": 3722,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 47462,
+			"enchant": 1144,
+			"gems": [
+				40133,
+				40155,
+				40113
+			]
+		},
+		{
+			"id": 47485,
+			"enchant": 2332,
+			"gems": [
+				40113,
+				0
+			]
+		},
+		{
+			"id": 47797,
+			"enchant": 3604,
+			"gems": [
+				40113,
+				0
+			]
+		},
+		{
+			"id": 47419,
+			"enchant": 3599,
+			"gems": [
+				40133,
+				40113,
+				40113
+			]
+		},
+		{
+			"id": 47795,
+			"enchant": 3872,
+			"gems": [
+				40113,
+				40153
+			]
+		},
+		{
+			"id": 47454,
+			"enchant": 3606,
+			"gems": [
+				40133,
+				40113
+			]
+		},
+		{
+			"id": 45495,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 47489,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 45518
+		},
+		{
+			"id": 45466
+		},
+		{
+			"id": 47422,
+			"enchant": 3834,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 48032,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 45294,
+			"gems": [
+				40051
+			]
+		}
+	]}`),
+}
+
+export const P3_Preset_Affliction_Alliance = {
+	name: 'P3 Affliction A',
+	tooltip: WarlockTooltips.BIS_TOOLTIP,
+	enableWhen: (player: Player<Spec.SpecWarlock>) => player.getRotation().type == RotationType.Affliction && player.getFaction() == Faction.Alliance,
+		gear: EquipmentSpec.fromJsonString(`{"items": [
+		{
+			"id": 47789,
+			"enchant": 3820,
+			"gems": [
+				41285,
+				40133
+			]
+		},
+		{
+			"id": 47144,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 47792,
+			"enchant": 3810,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 47552,
+			"enchant": 3722,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 47129,
+			"enchant": 1144,
+			"gems": [
+				40133,
+				40155,
+				40113
+			]
+		},
+		{
+			"id": 47208,
+			"enchant": 2332,
+			"gems": [
+				40113,
+				0
+			]
+		},
+		{
+			"id": 47788,
+			"enchant": 3604,
+			"gems": [
+				40113,
+				0
+			]
+		},
+		{
+			"id": 46973,
+			"enchant": 3599,
+			"gems": [
+				40133,
+				40113,
+				40113
+			]
+		},
+		{
+			"id": 47790,
+			"enchant": 3872,
+			"gems": [
+				40113,
+				40155
+			]
+		},
+		{
+			"id": 47097,
+			"enchant": 3606,
+			"gems": [
+				40133,
+				40113
+			]
+		},
+		{
+			"id": 45495,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 47237,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 45518
+		},
+		{
+			"id": 45466
+		},
+		{
+			"id": 46980,
+			"enchant": 3834,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 47958,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 45294,
+			"gems": [
+				40155
+			]
+		}
+	]}`),
+}
+
+export const P3_Preset_Demo_Horde = {
+	name: 'P3 Demo H',
+	tooltip: WarlockTooltips.BIS_TOOLTIP,
+	enableWhen: (player: Player<Spec.SpecWarlock>) => player.getRotation().type == RotationType.Demonology && player.getFaction() == Faction.Horde,
+		gear: EquipmentSpec.fromJsonString(`{"items": [
+		{
+			"id": 47796,
+			"enchant": 3820,
+			"gems": [
+				41285,
+				40133
+			]
+		},
+		{
+			"id": 45133,
+			"gems": [
+				40153
+			]
+		},
+		{
+			"id": 47793,
+			"enchant": 3810,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 47554,
+			"enchant": 3722,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 47794,
+			"enchant": 1144,
+			"gems": [
+				40113,
+				40133
+			]
+		},
+		{
+			"id": 47485,
+			"enchant": 2332,
+			"gems": [
+				40133,
+				0
+			]
+		},
+		{
+			"id": 47803,
+			"enchant": 3604,
+			"gems": [
+				40113,
+				0
+			]
+		},
+		{
+			"id": 47419,
+			"enchant": 3599,
+			"gems": [
+				40133,
+				40113,
+				40113
+			]
+		},
+		{
+			"id": 47435,
+			"enchant": 3872,
+			"gems": [
+				40113,
+				40133,
+				40133
+			]
+		},
+		{
+			"id": 47454,
+			"enchant": 3606,
+			"gems": [
+				40133,
+				40113
+			]
+		},
+		{
+			"id": 45495,
+			"gems": [
+				40133
+			]
+		},
+		{
+			"id": 47489,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 45518
+		},
+		{
+			"id": 40255
+		},
+		{
+			"id": 47422,
+			"enchant": 3834,
+			"gems": [
+				40133
+			]
+		},
+		{
+			"id": 47470
+		},
+		{
+			"id": 45294,
+			"gems": [
+				40113
+			]
+		}
+	]}`),
+}
+
+export const P3_Preset_Demo_Alliance = {
+	name: 'P3 Demo A',
+	tooltip: WarlockTooltips.BIS_TOOLTIP,
+	enableWhen: (player: Player<Spec.SpecWarlock>) => player.getRotation().type == RotationType.Demonology && player.getFaction() == Faction.Alliance,
+		gear: EquipmentSpec.fromJsonString(`{"items": [
+		{
+			"id": 47789,
+			"enchant": 3820,
+			"gems": [
+				41285,
+				40133
+			]
+		},
+		{
+			"id": 45243,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 47792,
+			"enchant": 3810,
+			"gems": [
+				40153
+			]
+		},
+		{
+			"id": 47553,
+			"enchant": 3722,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 47791,
+			"enchant": 1144,
+			"gems": [
+				40153,
+				40133
+			]
+		},
+		{
+			"id": 47208,
+			"enchant": 2332,
+			"gems": [
+				40133,
+				0
+			]
+		},
+		{
+			"id": 47788,
+			"enchant": 3604,
+			"gems": [
+				40113,
+				0
+			]
+		},
+		{
+			"id": 46973,
+			"enchant": 3599,
+			"gems": [
+				40133,
+				40113,
+				40113
+			]
+		},
+		{
+			"id": 47062,
+			"enchant": 3872,
+			"gems": [
+				40113,
+				40133,
+				40133
+			]
+		},
+		{
+			"id": 47097,
+			"enchant": 3606,
+			"gems": [
+				40133,
+				40113
+			]
+		},
+		{
+			"id": 45495,
+			"gems": [
+				40133
+			]
+		},
+		{
+			"id": 47237,
+			"gems": [
+				40153
+			]
+		},
+		{
+			"id": 45518
+		},
+		{
+			"id": 40255
+		},
+		{
+			"id": 46980,
+			"enchant": 3834,
+			"gems": [
+				40133
+			]
+		},
+		{
+			"id": 47146
+		},
+		{
+			"id": 45294,
+			"gems": [
+				40113
+			]
+		}
+	]}`),
+}
+
+export const P3_Preset_Destro_Horde = {
+	name: 'P3 Destro H',
+	tooltip: WarlockTooltips.BIS_TOOLTIP,
+	enableWhen: (player: Player<Spec.SpecWarlock>) => player.getRotation().type == RotationType.Destruction && player.getFaction() == Faction.Horde,
+		gear: EquipmentSpec.fromJsonString(`{"items": [
+		{
+			"id": 47695,
+			"enchant": 3820,
+			"gems": [
+				41285,
+				40155
+			]
+		},
+		{
+			"id": 47468,
+			"gems": [
+				40153
+			]
+		},
+		{
+			"id": 47793,
+			"enchant": 3810,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 47551,
+			"enchant": 3722,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 47794,
+			"enchant": 1144,
+			"gems": [
+				40113,
+				40133
+			]
+		},
+		{
+			"id": 47467,
+			"enchant": 2332,
+			"gems": [
+				40153,
+				0
+			]
+		},
+		{
+			"id": 47803,
+			"enchant": 3604,
+			"gems": [
+				40113,
+				0
+			]
+		},
+		{
+			"id": 47419,
+			"enchant": 3599,
+			"gems": [
+				40133,
+				40113,
+				40113
+			]
+		},
+		{
+			"id": 47435,
+			"enchant": 3872,
+			"gems": [
+				40113,
+				40133,
+				40133
+			]
+		},
+		{
+			"id": 47454,
+			"enchant": 3606,
+			"gems": [
+				40133,
+				40113
+			]
+		},
+		{
+			"id": 45495,
+			"gems": [
+				40133
+			]
+		},
+		{
+			"id": 47489,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 45518
+		},
+		{
+			"id": 47477
+		},
+		{
+			"id": 47422,
+			"enchant": 3834,
+			"gems": [
+				40133
+			]
+		},
+		{
+			"id": 47437
+		},
+		{
+			"id": 45294,
+			"gems": [
+				40153
+			]
+		}
+	]}`),
+}
+
+export const P3_Preset_Destro_Alliance = {
+	name: 'P3 Destro A',
+	tooltip: WarlockTooltips.BIS_TOOLTIP,
+	enableWhen: (player: Player<Spec.SpecWarlock>) => player.getRotation().type == RotationType.Destruction && player.getFaction() == Faction.Alliance,
+		gear: EquipmentSpec.fromJsonString(`{"items": [
+		{
+			"id": 47789,
+			"enchant": 3820,
+			"gems": [
+				41285,
+				40133
+			]
+		},
+		{
+			"id": 47144,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 47792,
+			"enchant": 3810,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 47552,
+			"enchant": 3722,
+			"gems": [
+				40113
+			]
+		},
+		{
+			"id": 47129,
+			"enchant": 1144,
+			"gems": [
+				40133,
+				40155,
+				40113
+			]
+		},
+		{
+			"id": 47208,
+			"enchant": 2332,
+			"gems": [
+				40133,
+				0
+			]
+		},
+		{
+			"id": 47788,
+			"enchant": 3604,
+			"gems": [
+				40113,
+				0
+			]
+		},
+		{
+			"id": 46973,
+			"enchant": 3599,
+			"gems": [
+				40133,
+				40113,
+				40113
+			]
+		},
+		{
+			"id": 47790,
+			"enchant": 3872,
+			"gems": [
+				40113,
+				40155
+			]
+		},
+		{
+			"id": 47205,
+			"enchant": 3606,
+			"gems": [
+				40133,
+				40113
+			]
+		},
+		{
+			"id": 45495,
+			"gems": [
+				40133
+			]
+		},
+		{
+			"id": 47237,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 45518
+		},
+		{
+			"id": 47188
+		},
+		{
+			"id": 46980,
+			"enchant": 3834,
+			"gems": [
+				40133
+			]
+		},
+		{
+			"id": 47958,
+			"gems": [
+				40155
+			]
+		},
+		{
+			"id": 45294,
+			"gems": [
+				40155
+			]
+		}
+	]}`),
+}
+
 export const Naked = {
 	name: 'The Naked Bolt',
 	gear: EquipmentSpec.fromJsonString(`
diff --git a/ui/warlock/sim.ts b/ui/warlock/sim.ts
index b4224130ea..d07b25c54d 100644
--- a/ui/warlock/sim.ts
+++ b/ui/warlock/sim.ts
@@ -69,7 +69,7 @@ export class WarlockSimUI extends IndividualSimUI<Spec.SpecWarlock> {
 
 			defaults: {
 				// Default equipped gear.
-				gear: Presets.P2_Preset_Affliction.gear,
+				gear: Presets.P3_Preset_Affliction_Horde.gear,
 
 				// Default EP weights for sorting gear in the gear picker.
 				epWeights: Stats.fromMap({
@@ -166,6 +166,12 @@ export class WarlockSimUI extends IndividualSimUI<Spec.SpecWarlock> {
 					Presets.P1_Preset_Demo_Destro,
 					Presets.P2_Preset_Affliction,
 					Presets.P2_Preset_Demo_Destro,
+					Presets.P3_Preset_Affliction_Horde,
+					Presets.P3_Preset_Affliction_Alliance,
+					Presets.P3_Preset_Demo_Horde,
+					Presets.P3_Preset_Demo_Alliance,
+					Presets.P3_Preset_Destro_Horde,
+					Presets.P3_Preset_Destro_Alliance,
 				],
 			},
 		});