diff --git a/sim/warlock/TestDemonology.results b/sim/warlock/TestDemonology.results
index f4df027900..8279f7033d 100644
--- a/sim/warlock/TestDemonology.results
+++ b/sim/warlock/TestDemonology.results
@@ -46,738 +46,738 @@ character_stats_results: {
 dps_results: {
  key: "TestDemonology-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 13417.31696
-  tps: 11658.64291
+  dps: 13362.9926
+  tps: 11605.06694
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 13436.63519
-  tps: 11673.70642
+  dps: 13408.47575
+  tps: 11646.08451
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-AshtongueTalismanofShadows-32493"
  value: {
-  dps: 13245.14315
-  tps: 11501.91282
+  dps: 13223.59596
+  tps: 11481.52309
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 13620.57761
-  tps: 11843.39499
+  dps: 13573.58115
+  tps: 11798.10008
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 13077.13033
-  tps: 11353.0749
-  hps: 102.49336
+  dps: 13006.0771
+  tps: 11284.03967
+  hps: 101.08784
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 13077.13033
-  tps: 11353.0749
-  hps: 102.49336
+  dps: 13006.0771
+  tps: 11284.03967
+  hps: 101.08784
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 13642.25995
-  tps: 11864.89637
+  dps: 13563.75667
+  tps: 11788.03405
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 9921.59431
-  tps: 8459.24974
+  dps: 9902.89183
+  tps: 8440.13945
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 13655.78385
-  tps: 11638.99091
+  dps: 13599.47078
+  tps: 11585.96681
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 13987.55061
-  tps: 12211.3241
+  dps: 13937.65732
+  tps: 12163.36117
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 13143.97526
-  tps: 11413.75089
+  dps: 13073.06117
+  tps: 11345.1642
   hps: 64
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkCoven'sRegalia"
  value: {
-  dps: 12755.71414
-  tps: 11061.01924
+  dps: 12728.43281
+  tps: 11034.66574
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 13240.73419
-  tps: 11516.47627
+  dps: 13169.18682
+  tps: 11446.70105
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 13264.93211
-  tps: 11540.79981
+  dps: 13205.69172
+  tps: 11483.33552
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 13181.03399
-  tps: 11450.98376
+  dps: 13123.06301
+  tps: 11391.45655
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Death'sChoice-47464"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 13133.75022
-  tps: 11409.4923
+  dps: 13054.31942
+  tps: 11331.83365
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DeathbringerGarb"
  value: {
-  dps: 10851.44914
-  tps: 9282.50751
+  dps: 10829.58867
+  tps: 9256.94195
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Defender'sCode-40257"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.09262
+  tps: 11278.60685
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 13652.50644
-  tps: 11876.27993
+  dps: 13604.8557
+  tps: 11830.55955
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 13874.94151
-  tps: 12104.63929
+  dps: 13835.25615
+  tps: 12063.59581
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 13620.57761
-  tps: 11843.39499
+  dps: 13573.58115
+  tps: 11798.10008
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 13677.75974
-  tps: 11895.67881
+  dps: 13584.42686
+  tps: 11804.01851
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 13646.0225
-  tps: 11869.79598
+  dps: 13597.95754
+  tps: 11823.66138
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 13637.52959
-  tps: 11861.30307
+  dps: 13588.9541
+  tps: 11814.65795
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 13260.66392
-  tps: 11537.05537
+  dps: 13200.05256
+  tps: 11476.85655
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 13105.61399
-  tps: 11378.55729
+  dps: 13039.12931
+  tps: 11313.92687
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 13609.78634
-  tps: 11833.55983
+  dps: 13562.44986
+  tps: 11788.1537
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 13206.33109
-  tps: 11482.04155
+  dps: 13232.58503
+  tps: 11510.37767
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 13456.75793
-  tps: 11707.82466
+  dps: 13416.73309
+  tps: 11669.56719
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 13099.69744
-  tps: 11374.06795
+  dps: 13041.91339
+  tps: 11315.17499
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 13272.02443
-  tps: 11527.43425
+  dps: 13211.86872
+  tps: 11468.52981
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ForgeEmber-37660"
  value: {
-  dps: 13414.74685
-  tps: 11668.49755
+  dps: 13362.65503
+  tps: 11617.2622
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 13655.78385
-  tps: 11874.35204
+  dps: 13599.47078
+  tps: 11820.25
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 13654.90049
-  tps: 11874.46637
+  dps: 13588.30536
+  tps: 11809.90411
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-FuturesightRune-38763"
  value: {
-  dps: 13244.55905
-  tps: 11503.83787
+  dps: 13205.12887
+  tps: 11464.5391
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Gladiator'sFelshroud"
  value: {
-  dps: 10687.3293
-  tps: 9107.41386
+  dps: 10677.0966
+  tps: 9098.70061
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 13435.16729
-  tps: 11674.16246
+  dps: 13387.6928
+  tps: 11626.99352
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 13473.9598
-  tps: 11707.62348
+  dps: 13438.36879
+  tps: 11673.25119
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 13231.96529
-  tps: 11507.84404
+  dps: 13184.64163
+  tps: 11462.7986
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Gul'dan'sRegalia"
  value: {
-  dps: 11188.33387
-  tps: 9443.73545
+  dps: 11170.31233
+  tps: 9425.53097
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 13435.95467
-  tps: 11673.61487
+  dps: 13395.10575
+  tps: 11633.43219
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 13646.0225
-  tps: 11869.79598
+  dps: 13597.95754
+  tps: 11823.66138
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 13637.52959
-  tps: 11861.30307
+  dps: 13588.9541
+  tps: 11814.65795
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-IncisorFragment-37723"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.09262
+  tps: 11278.60685
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 13657.68356
-  tps: 11882.59037
+  dps: 13576.20154
+  tps: 11802.41958
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 13609.78634
-  tps: 11833.55983
+  dps: 13562.44986
+  tps: 11788.1537
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 13275.52579
-  tps: 11529.87007
+  dps: 13229.87428
+  tps: 11485.10666
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MaleficRaiment"
  value: {
-  dps: 8523.72687
-  tps: 7157.22159
+  dps: 8500.92025
+  tps: 7137.00467
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 13196.82754
-  tps: 11472.56962
+  dps: 13121.26418
+  tps: 11398.77841
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 13342.65729
-  tps: 11598.0671
+  dps: 13276.44705
+  tps: 11533.10814
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 13609.78634
-  tps: 11833.55983
+  dps: 13562.44986
+  tps: 11788.1537
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 13609.78634
-  tps: 11833.55983
+  dps: 13562.44986
+  tps: 11788.1537
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PlagueheartGarb"
  value: {
-  dps: 10360.85416
-  tps: 8820.18392
+  dps: 10353.38967
+  tps: 8813.1671
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 13618.779
-  tps: 11841.74809
+  dps: 13569.99782
+  tps: 11794.76338
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 13620.57761
-  tps: 11843.39499
+  dps: 13573.58115
+  tps: 11798.10008
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 13615.25479
-  tps: 11861.71483
+  dps: 13578.66848
+  tps: 11826.60815
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 13668.67641
-  tps: 11912.65287
+  dps: 13625.62539
+  tps: 11869.82399
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 13948.0532
-  tps: 12171.82669
+  dps: 13898.95395
+  tps: 12124.6578
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 13605.83603
-  tps: 11830.72831
+  dps: 13555.88187
+  tps: 11780.03817
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.09262
+  tps: 11278.60685
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.09262
+  tps: 11278.60685
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 13143.97526
-  tps: 11413.75089
+  dps: 13073.04367
+  tps: 11345.1467
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 13393.37816
-  tps: 11638.48125
+  dps: 13367.39811
+  tps: 11613.85091
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 13433.76001
-  tps: 11672.68692
+  dps: 13358.48994
+  tps: 11601.09505
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SoulPreserver-37111"
  value: {
-  dps: 13192.98633
-  tps: 11456.81998
+  dps: 13163.13832
+  tps: 11426.59504
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SouloftheDead-40382"
  value: {
-  dps: 13205.81551
-  tps: 11482.4252
+  dps: 13196.76389
+  tps: 11475.18871
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SparkofLife-37657"
  value: {
-  dps: 13219.18241
-  tps: 11490.95906
+  dps: 13203.57651
+  tps: 11476.11353
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 13094.19975
-  tps: 11355.22268
+  dps: 13025.12425
+  tps: 11287.66844
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 13609.78634
-  tps: 11833.55983
+  dps: 13562.44986
+  tps: 11788.1537
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 13609.78634
-  tps: 11833.55983
+  dps: 13562.44986
+  tps: 11788.1537
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 13609.78634
-  tps: 11833.55983
+  dps: 13562.44986
+  tps: 11788.1537
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 13162.97939
-  tps: 11430.78677
+  dps: 13117.12603
+  tps: 11386.11813
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 13124.68662
-  tps: 11395.09828
+  dps: 13083.28612
+  tps: 11354.52228
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 13080.90366
-  tps: 11356.64575
+  dps: 13001.05853
+  tps: 11278.57276
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 13609.78634
-  tps: 11833.55983
+  dps: 13562.44986
+  tps: 11788.1537
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 13088.36912
-  tps: 11343.35538
+  dps: 13036.21327
+  tps: 11291.58017
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 13088.36912
-  tps: 11343.35538
+  dps: 13036.21327
+  tps: 11291.58017
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 13655.78385
-  tps: 11874.35204
+  dps: 13599.47078
+  tps: 11820.25
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 13654.90049
-  tps: 11874.46637
+  dps: 13588.30536
+  tps: 11809.90411
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 13318.20984
-  tps: 11585.33436
+  dps: 13269.52013
+  tps: 11535.64917
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 13654.90049
-  tps: 11874.46637
+  dps: 13588.30536
+  tps: 11809.90411
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 13655.78385
-  tps: 11874.35204
+  dps: 13599.47078
+  tps: 11820.25
  }
 }
 dps_results: {
  key: "TestDemonology-AllItems-WingedTalisman-37844"
  value: {
-  dps: 13285.8383
-  tps: 11543.08569
+  dps: 13220.90237
+  tps: 11480.34933
  }
 }
 dps_results: {
  key: "TestDemonology-Average-Default"
  value: {
-  dps: 14120.88245
-  tps: 12330.57619
+  dps: 14094.85717
+  tps: 12300.56245
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock-demo-FullBuffs-LongMultiTarget"
  value: {
-  dps: 17438.86787
-  tps: 17278.70009
+  dps: 17327.69771
+  tps: 17164.80693
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock-demo-FullBuffs-LongSingleTarget"
  value: {
-  dps: 13987.55061
-  tps: 12211.3241
+  dps: 13937.65732
+  tps: 12163.36117
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock-demo-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 15867.80813
-  tps: 13801.53668
+  dps: 15997.67468
+  tps: 13932.25441
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock-demo-NoBuffs-LongMultiTarget"
  value: {
-  dps: 10675.54295
-  tps: 12403.23872
+  dps: 10670.49322
+  tps: 12397.56516
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock-demo-NoBuffs-LongSingleTarget"
  value: {
-  dps: 8150.0904
-  tps: 7534.10248
+  dps: 8066.21241
+  tps: 7450.9108
  }
 }
 dps_results: {
  key: "TestDemonology-Settings-Orc-p4_demo-Demonology Warlock-demo-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 8579.77973
-  tps: 7822.12309
+  dps: 8263.86975
+  tps: 7507.09706
  }
 }
 dps_results: {
  key: "TestDemonology-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 13872.1688
-  tps: 12238.92734
+  dps: 13827.77154
+  tps: 12196.0304
  }
 }
diff --git a/sim/warlock/TestDestruction.results b/sim/warlock/TestDestruction.results
index 72ed924ef4..dfd0bc5387 100644
--- a/sim/warlock/TestDestruction.results
+++ b/sim/warlock/TestDestruction.results
@@ -47,42 +47,42 @@ dps_results: {
  key: "TestDestruction-AllItems-Althor'sAbacus-50359"
  value: {
   dps: 13389.20634
-  tps: 11054.85323
+  tps: 11055.91814
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Althor'sAbacus-50366"
  value: {
   dps: 13435.121
-  tps: 11094.08882
+  tps: 11095.13998
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-AshtongueTalismanofShadows-32493"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-AustereEarthsiegeDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.83061
+  tps: 10958.03654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Bandit'sInsignia-40371"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BaubleofTrueBlood-50354"
  value: {
   dps: 13020.8403
-  tps: 10740.73409
+  tps: 10741.89779
   hps: 102.01591
  }
 }
@@ -90,7 +90,7 @@ dps_results: {
  key: "TestDestruction-AllItems-BaubleofTrueBlood-50726"
  value: {
   dps: 13020.8403
-  tps: 10740.73409
+  tps: 10741.89779
   hps: 102.01591
  }
 }
@@ -98,49 +98,49 @@ dps_results: {
  key: "TestDestruction-AllItems-BeamingEarthsiegeDiamond"
  value: {
   dps: 13313.85188
-  tps: 10989.40455
+  tps: 10990.42966
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 10034.11635
-  tps: 8161.63757
+  dps: 10049.22959
+  tps: 8178.14603
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-BracingEarthsiegeDiamond"
  value: {
   dps: 13329.62911
-  tps: 10783.32088
+  tps: 10784.50569
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ChaoticSkyflareDiamond"
  value: {
   dps: 13740.25849
-  tps: 11372.58946
+  tps: 11373.79539
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-CorpseTongueCoin-50349"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-CorpseTongueCoin-50352"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-CorrodedSkeletonKey-50356"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
   hps: 64
  }
 }
@@ -148,609 +148,609 @@ dps_results: {
  key: "TestDestruction-AllItems-DarkCoven'sRegalia"
  value: {
   dps: 12529.42945
-  tps: 10306.09456
+  tps: 10307.31339
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
   dps: 13172.29251
-  tps: 10876.66872
+  tps: 10877.83242
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DarkmoonCard:Death-42990"
  value: {
   dps: 13228.31371
-  tps: 10937.94004
+  tps: 10939.10375
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DarkmoonCard:Greatness-44255"
  value: {
   dps: 13111.70956
-  tps: 10827.76372
+  tps: 10823.45164
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Death'sChoice-47464"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DeathKnight'sAnguish-38212"
  value: {
   dps: 13060.88686
-  tps: 10776.3729
+  tps: 10777.5366
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Deathbringer'sWill-50362"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Deathbringer'sWill-50363"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DeathbringerGarb"
  value: {
   dps: 10977.39094
-  tps: 8957.62965
+  tps: 8960.47538
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Defender'sCode-40257"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DestructiveSkyflareDiamond"
  value: {
   dps: 13321.92919
-  tps: 10996.04661
+  tps: 10997.25254
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-DislodgedForeignObject-50353"
  value: {
   dps: 13702.8365
-  tps: 11338.76511
+  tps: 11340.05406
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EffulgentSkyflareDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.83061
+  tps: 10958.03654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EmberSkyflareDiamond"
  value: {
   dps: 13347.01795
-  tps: 11016.56304
+  tps: 11017.59017
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EnigmaticSkyflareDiamond"
  value: {
   dps: 13313.85188
-  tps: 10988.77703
+  tps: 10989.98297
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EnigmaticStarflareDiamond"
  value: {
   dps: 13306.40413
-  tps: 10982.07406
+  tps: 10983.27999
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EphemeralSnowflake-50260"
  value: {
   dps: 13131.99417
-  tps: 10846.45349
+  tps: 10847.91554
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EssenceofGossamer-37220"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EternalEarthsiegeDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.83061
+  tps: 10958.03654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ExtractofNecromanticPower-40373"
  value: {
   dps: 13225.57447
-  tps: 10934.13049
+  tps: 10935.29419
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-EyeoftheBroodmother-45308"
  value: {
   dps: 13414.44181
-  tps: 11082.22826
+  tps: 11083.32309
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Figurine-SapphireOwl-42413"
  value: {
   dps: 13037.33164
-  tps: 10755.25739
+  tps: 10756.38657
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ForethoughtTalisman-40258"
  value: {
   dps: 13247.2883
-  tps: 10933.57834
+  tps: 10934.68446
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ForgeEmber-37660"
  value: {
   dps: 13317.79421
-  tps: 10998.73333
+  tps: 10999.84184
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ForlornSkyflareDiamond"
  value: {
   dps: 13329.62911
-  tps: 11000.62695
+  tps: 11001.81176
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ForlornStarflareDiamond"
  value: {
   dps: 13319.37446
-  tps: 10991.8685
+  tps: 10993.05691
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FuryoftheFiveFlights-40431"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-FuturesightRune-38763"
  value: {
   dps: 13197.44343
-  tps: 10891.01264
+  tps: 10892.14568
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Gladiator'sFelshroud"
  value: {
   dps: 10539.28532
-  tps: 8572.46637
+  tps: 8575.85313
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GlowingTwilightScale-54573"
  value: {
   dps: 13412.16367
-  tps: 11074.47102
+  tps: 11075.52906
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GlowingTwilightScale-54589"
  value: {
   dps: 13464.33942
-  tps: 11119.05713
+  tps: 11120.09955
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-GnomishLightningGenerator-41121"
  value: {
   dps: 13178.65941
-  tps: 10887.49102
+  tps: 10888.65472
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Gul'dan'sRegalia"
  value: {
   dps: 11239.39468
-  tps: 9123.46118
+  tps: 9125.35069
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
   dps: 13424.99484
-  tps: 11085.1676
+  tps: 11086.21939
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpassiveSkyflareDiamond"
  value: {
   dps: 13313.85188
-  tps: 10988.77703
+  tps: 10989.98297
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ImpassiveStarflareDiamond"
  value: {
   dps: 13306.40413
-  tps: 10982.07406
+  tps: 10983.27999
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-IncisorFragment-37723"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-InsightfulEarthsiegeDiamond"
  value: {
   dps: 13293.59654
-  tps: 10975.31009
+  tps: 10975.74093
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.83061
+  tps: 10958.03654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Lavanthor'sTalisman-37872"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MajesticDragonFigurine-40430"
  value: {
   dps: 13254.73916
-  tps: 10939.77219
+  tps: 10940.87656
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MaleficRaiment"
  value: {
-  dps: 8360.99106
-  tps: 6692.24704
+  dps: 8391.03484
+  tps: 6711.58647
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-MeteoriteWhetstone-37390"
  value: {
   dps: 13123.39121
-  tps: 10832.62682
+  tps: 10833.79052
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-NevermeltingIceCrystal-50259"
  value: {
   dps: 13280.06074
-  tps: 10963.07354
+  tps: 10964.17965
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-OfferingofSacrifice-37638"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PersistentEarthshatterDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.83061
+  tps: 10958.03654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PersistentEarthsiegeDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.83061
+  tps: 10958.03654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PetrifiedScarab-21685"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PetrifiedTwilightScale-54571"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PetrifiedTwilightScale-54591"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PlagueheartGarb"
  value: {
-  dps: 10206.67303
-  tps: 8267.41117
+  dps: 10210.45501
+  tps: 8273.69263
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PowerfulEarthshatterDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.83061
+  tps: 10958.03654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PowerfulEarthsiegeDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.83061
+  tps: 10958.03654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-PurifiedShardoftheGods"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ReignoftheDead-47316"
  value: {
   dps: 13577.13263
-  tps: 11251.09524
+  tps: 11252.17796
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ReignoftheDead-47477"
  value: {
   dps: 13647.53166
-  tps: 11316.03299
+  tps: 11317.10478
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RelentlessEarthsiegeDiamond"
  value: {
   dps: 13701.66868
-  tps: 11337.85863
+  tps: 11339.06456
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RevitalizingSkyflareDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.48724
+  tps: 10957.58633
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-RuneofRepulsion-40372"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SealofthePantheon-36993"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ShinyShardoftheGods"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SliverofPureIce-50339"
  value: {
   dps: 13345.37871
-  tps: 11021.69552
+  tps: 11022.52196
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SliverofPureIce-50346"
  value: {
   dps: 13387.11931
-  tps: 11057.84275
+  tps: 11058.55731
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SoulPreserver-37111"
  value: {
   dps: 13172.15522
-  tps: 10869.37274
+  tps: 10870.49874
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SouloftheDead-40382"
  value: {
   dps: 13149.20484
-  tps: 10860.8469
+  tps: 10861.13615
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SparkofLife-37657"
  value: {
   dps: 13065.8288
-  tps: 10778.64012
+  tps: 10779.53333
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
   dps: 13022.23918
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SwiftSkyflareDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.83061
+  tps: 10958.03654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SwiftStarflareDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.83061
+  tps: 10958.03654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-SwiftWindfireDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.83061
+  tps: 10958.03654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TalismanofTrollDivinity-37734"
  value: {
   dps: 13114.50519
-  tps: 10820.09928
+  tps: 10821.24086
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TearsoftheVanquished-47215"
  value: {
   dps: 13060.91843
-  tps: 10776.01541
+  tps: 10776.83215
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TheGeneral'sHeart-45507"
  value: {
   dps: 13015.62797
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-ThunderingSkyflareDiamond"
  value: {
   dps: 13278.35585
-  tps: 10956.83061
+  tps: 10958.03654
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TinyAbominationinaJar-50351"
  value: {
   dps: 13023.96692
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TinyAbominationinaJar-50706"
  value: {
   dps: 13023.96692
-  tps: 10735.61276
+  tps: 10736.77646
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TirelessSkyflareDiamond"
  value: {
   dps: 13329.62911
-  tps: 11000.62695
+  tps: 11001.81176
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TirelessStarflareDiamond"
  value: {
   dps: 13319.37446
-  tps: 10991.8685
+  tps: 10993.05691
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TomeofArcanePhenomena-36972"
  value: {
   dps: 13293.92049
-  tps: 10985.03588
+  tps: 10986.16105
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TrenchantEarthshatterDiamond"
  value: {
   dps: 13319.37446
-  tps: 10991.8685
+  tps: 10993.05691
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-TrenchantEarthsiegeDiamond"
  value: {
   dps: 13329.62911
-  tps: 11000.62695
+  tps: 11001.81176
  }
 }
 dps_results: {
  key: "TestDestruction-AllItems-WingedTalisman-37844"
  value: {
   dps: 13167.51032
-  tps: 10865.49212
+  tps: 10866.65582
  }
 }
 dps_results: {
  key: "TestDestruction-Average-Default"
  value: {
   dps: 13933.56914
-  tps: 11535.47493
+  tps: 11536.39471
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock-destro-FullBuffs-LongMultiTarget"
  value: {
   dps: 13954.55789
-  tps: 14157.31002
+  tps: 14181.4287
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock-destro-FullBuffs-LongSingleTarget"
  value: {
   dps: 13740.25849
-  tps: 11372.58946
+  tps: 11373.79539
  }
 }
 dps_results: {
  key: "TestDestruction-Settings-Orc-p4_destro-Destruction Warlock-destro-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 15068.92765
-  tps: 12278.35906
+  dps: 15092.54473
+  tps: 12305.56218
  }
 }
 dps_results: {
@@ -778,6 +778,6 @@ dps_results: {
  key: "TestDestruction-SwitchInFrontOfTarget-Default"
  value: {
   dps: 13707.6834
-  tps: 11372.58946
+  tps: 11373.79539
  }
 }
diff --git a/sim/warlock/warlock.go b/sim/warlock/warlock.go
index f25546e27d..a266785991 100644
--- a/sim/warlock/warlock.go
+++ b/sim/warlock/warlock.go
@@ -133,7 +133,9 @@ func (warlock *Warlock) Initialize() {
 	warlock.registerInfernoSpell()
 	warlock.registerBlackBook()
 
-	warlock.defineRotation()
+	if !warlock.IsUsingAPL {
+		warlock.defineRotation()
+	}
 
 	precastSpell := warlock.ShadowBolt
 	if warlock.Rotation.Type == proto.Warlock_Rotation_Destruction {
@@ -206,9 +208,9 @@ func (warlock *Warlock) Reset(sim *core.Simulation) {
 	if !warlock.IsUsingAPL {
 		warlock.ItemSwap.SwapItems(sim, []proto.ItemSlot{proto.ItemSlot_ItemSlotMainHand,
 			proto.ItemSlot_ItemSlotOffHand, proto.ItemSlot_ItemSlotRanged})
+		warlock.corrRefreshList = make([]time.Duration, len(warlock.Env.Encounter.TargetUnits))
+		warlock.setupCooldowns(sim)
 	}
-	warlock.corrRefreshList = make([]time.Duration, len(warlock.Env.Encounter.TargetUnits))
-	warlock.setupCooldowns(sim)
 }
 
 func NewWarlock(character *core.Character, options *proto.Player) *Warlock {