diff --git a/sim/druid/feral/TestFeralApl.results b/sim/druid/feral/TestFeralApl.results
index 8c6767b816..40bdfbed07 100644
--- a/sim/druid/feral/TestFeralApl.results
+++ b/sim/druid/feral/TestFeralApl.results
@@ -46,956 +46,956 @@ character_stats_results: {
 dps_results: {
  key: "TestFeralApl-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-AshtongueTalismanofEquilibrium-32486"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 11198.69811
-  tps: 8019.20631
+  dps: 11053.54068
+  tps: 7908.21715
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
   hps: 91.80479
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
   hps: 91.80479
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 11285.83135
-  tps: 8080.84655
+  dps: 11169.92198
+  tps: 7991.2218
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 8472.69712
-  tps: 6081.27765
+  dps: 8367.89573
+  tps: 5999.83872
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 11242.52294
-  tps: 7889.09563
+  dps: 11134.55244
+  tps: 7806.86053
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-BrutalGladiator'sIdolofResolve-35019"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 11563.15321
-  tps: 8277.74508
+  dps: 11442.28988
+  tps: 8184.60302
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
   hps: 64
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 11165.28932
-  tps: 7995.48607
+  dps: 11018.16099
+  tps: 7883.4715
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 11191.18222
-  tps: 8013.79524
+  dps: 11048.11396
+  tps: 7904.88768
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 11210.02165
-  tps: 8027.02167
+  dps: 11078.34064
+  tps: 7926.12427
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-DeadlyGladiator'sIdolofResolve-42588"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Death'sChoice-47464"
  value: {
-  dps: 11565.82955
-  tps: 8279.72006
+  dps: 11450.1305
+  tps: 8190.16986
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 11121.74121
-  tps: 7964.41734
+  dps: 10970.57227
+  tps: 7849.68351
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 11583.01548
-  tps: 8291.92207
+  dps: 11488.98044
+  tps: 8217.8281
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 11704.68121
-  tps: 8378.45431
+  dps: 11588.31383
+  tps: 8288.28002
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Defender'sCode-40257"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 11295.16784
-  tps: 8087.47546
+  dps: 11174.71865
+  tps: 7994.62744
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 11214.81916
-  tps: 8030.80183
+  dps: 11096.66221
+  tps: 7939.0578
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 11162.84122
-  tps: 7993.44877
+  dps: 11066.03055
+  tps: 7917.30931
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-DreamwalkerBattlegear"
  value: {
-  dps: 9219.6516
-  tps: 6611.16661
+  dps: 9190.2289
+  tps: 6583.39612
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-DreamwalkerGarb"
  value: {
-  dps: 7980.90872
-  tps: 5734.35148
+  dps: 7917.98149
+  tps: 5682.79278
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 11285.83135
-  tps: 8080.84655
+  dps: 11169.92198
+  tps: 7991.2218
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 11282.33097
-  tps: 8078.36128
+  dps: 11167.23974
+  tps: 7989.31742
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 11049.58589
-  tps: 7913.26185
+  dps: 10998.21993
+  tps: 7869.53771
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 11197.2449
-  tps: 8018.17453
+  dps: 11048.28537
+  tps: 7904.78503
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 11140.29938
-  tps: 7977.74322
+  dps: 10999.13015
+  tps: 7869.9596
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ForgeEmber-37660"
  value: {
-  dps: 11100.1077
-  tps: 7949.13234
+  dps: 10965.1328
+  tps: 7845.82149
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-FuriousGladiator'sIdolofResolve-42589"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 11237.73842
-  tps: 8046.77536
+  dps: 11098.77661
+  tps: 7940.63381
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-FuturesightRune-38763"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Gladiator'sSanctuary"
  value: {
-  dps: 9710.12641
-  tps: 6959.85245
+  dps: 9708.33043
+  tps: 6951.77172
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Gladiator'sWildhide"
  value: {
-  dps: 8070.99864
-  tps: 5795.99694
+  dps: 7937.76831
+  tps: 5694.44825
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 11167.85616
-  tps: 7997.4581
+  dps: 11025.55515
+  tps: 7888.57178
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-HatefulGladiator'sIdolofResolve-42587"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Heartpierce-49982"
  value: {
-  dps: 11751.08687
-  tps: 8411.32754
+  dps: 11684.47467
+  tps: 8356.10549
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Heartpierce-50641"
  value: {
-  dps: 11798.3545
-  tps: 8444.43884
+  dps: 11752.75713
+  tps: 8405.03476
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-IdolofLunarFury-47670"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-IdoloftheCorruptor-45509"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-IdoloftheCryingMoon-50456"
  value: {
-  dps: 11603.48638
-  tps: 8306.30684
+  dps: 11464.02712
+  tps: 8199.96167
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-IdoloftheLunarEclipse-50457"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-IdoloftheRavenGoddess-32387"
  value: {
-  dps: 11267.51824
-  tps: 8067.99381
+  dps: 11159.39707
+  tps: 7983.8239
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-IdoloftheUnseenMoon-33510"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-IdoloftheWhiteStag-32257"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 11285.83135
-  tps: 8080.84655
+  dps: 11169.92198
+  tps: 7991.2218
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 11282.33097
-  tps: 8078.36128
+  dps: 11167.23974
+  tps: 7989.31742
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-IncisorFragment-37723"
  value: {
-  dps: 11220.0487
-  tps: 8034.21565
+  dps: 11081.69201
+  tps: 7928.50374
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 11275.21708
-  tps: 8073.31042
+  dps: 11166.84764
+  tps: 7989.11381
   hps: 15.15199
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-LasherweaveBattlegear"
  value: {
-  dps: 11876.22946
-  tps: 8498.08476
+  dps: 11834.21272
+  tps: 8460.69942
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-LasherweaveRegalia"
  value: {
-  dps: 8630.99226
-  tps: 6199.12663
+  dps: 8591.80379
+  tps: 6163.07628
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-LastWord-50179"
  value: {
-  dps: 11760.52477
-  tps: 8417.87888
+  dps: 11640.63516
+  tps: 8325.42816
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-LastWord-50708"
  value: {
-  dps: 11788.84408
-  tps: 8437.98559
+  dps: 11668.66557
+  tps: 8345.32975
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Malfurion'sBattlegear"
  value: {
-  dps: 9845.70373
-  tps: 7059.62731
+  dps: 9762.5458
+  tps: 6992.80737
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Malfurion'sRegalia"
  value: {
-  dps: 7987.52535
-  tps: 5741.29289
+  dps: 7969.39515
+  tps: 5720.56785
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 11215.13324
-  tps: 8031.02483
+  dps: 11179.86722
+  tps: 7998.20814
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 11097.70589
-  tps: 7947.27747
+  dps: 11035.14962
+  tps: 7895.60822
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Nibelung-49992"
  value: {
-  dps: 11570.86052
-  tps: 8283.21726
+  dps: 11453.32526
+  tps: 8192.43814
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Nibelung-50648"
  value: {
-  dps: 11570.86052
-  tps: 8283.21726
+  dps: 11453.32526
+  tps: 8192.43814
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-NightsongBattlegear"
  value: {
-  dps: 9769.94881
-  tps: 7002.84985
+  dps: 9740.57618
+  tps: 6975.26449
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-NightsongGarb"
  value: {
-  dps: 7873.26884
-  tps: 5661.29257
+  dps: 7845.4538
+  tps: 5633.39215
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 11268.98962
-  tps: 8068.88892
+  dps: 11160.69617
+  tps: 7984.74627
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 11275.21708
-  tps: 8073.31042
+  dps: 11166.84764
+  tps: 7989.11381
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 11570.86052
-  tps: 8283.21726
+  dps: 11453.32526
+  tps: 8192.43814
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-RelentlessGladiator'sIdolofResolve-42591"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-SavageGladiator'sIdolofResolve-42574"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-SoulPreserver-37111"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-SouloftheDead-40382"
  value: {
-  dps: 11152.69224
-  tps: 7986.54214
+  dps: 11006.02456
+  tps: 7874.85464
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-SparkofLife-37657"
  value: {
-  dps: 11070.78441
-  tps: 7928.16322
+  dps: 11012.9848
+  tps: 7879.64683
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 11158.05651
-  tps: 7992.14565
+  dps: 11069.73947
+  tps: 7921.28881
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-StormshroudArmor"
  value: {
-  dps: 8622.35283
-  tps: 6187.90714
+  dps: 8601.68001
+  tps: 6166.49863
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 11275.21708
-  tps: 8073.31042
+  dps: 11166.84764
+  tps: 7989.11381
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 11268.98962
-  tps: 8068.88892
+  dps: 11160.69617
+  tps: 7984.74627
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 11258.09158
-  tps: 8061.15131
+  dps: 11149.9311
+  tps: 7977.10307
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ThunderheartHarness"
  value: {
-  dps: 7437.25927
-  tps: 5343.12531
+  dps: 7484.346
+  tps: 5369.67652
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ThunderheartRegalia"
  value: {
-  dps: 6567.30708
-  tps: 4726.50627
+  dps: 6578.93302
+  tps: 4727.58116
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 11268.14575
-  tps: 8068.66371
+  dps: 11229.91029
+  tps: 8033.88829
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 11127.62626
-  tps: 7971.66198
+  dps: 11058.12293
+  tps: 7914.31244
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 11202.17897
-  tps: 8024.44483
+  dps: 11143.20624
+  tps: 7974.57202
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 11049.54187
-  tps: 7913.45496
+  dps: 10994.71822
+  tps: 7866.90192
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 11242.52294
-  tps: 8050.09758
+  dps: 11134.55244
+  tps: 7966.18422
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 8810.19617
-  tps: 6321.20112
+  dps: 8740.20174
+  tps: 6264.32555
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 8675.06384
-  tps: 6227.65034
+  dps: 8600.30629
+  tps: 6166.94424
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-VengefulGladiator'sIdolofResolve-33947"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-WingedTalisman-37844"
  value: {
-  dps: 10989.03386
-  tps: 7870.19512
+  dps: 10853.70661
+  tps: 7766.6341
  }
 }
 dps_results: {
  key: "TestFeralApl-AllItems-WrathfulGladiator'sIdolofResolve-51429"
  value: {
-  dps: 11212.30021
-  tps: 8028.78901
+  dps: 11107.39591
+  tps: 7946.90308
  }
 }
 dps_results: {
  key: "TestFeralApl-Average-Default"
  value: {
-  dps: 11510.71683
-  tps: 8240.99029
+  dps: 11456.57961
+  tps: 8194.76951
  }
 }
 dps_results: {
  key: "TestFeralApl-Settings-Tauren-p3-Default-default-FullBuffs-LongMultiTarget"
  value: {
-  dps: 11570.86052
-  tps: 8283.21726
+  dps: 11453.32526
+  tps: 8192.43814
  }
 }
 dps_results: {
  key: "TestFeralApl-Settings-Tauren-p3-Default-default-FullBuffs-LongSingleTarget"
  value: {
-  dps: 11570.86052
-  tps: 8283.21726
+  dps: 11453.32526
+  tps: 8192.43814
  }
 }
 dps_results: {
  key: "TestFeralApl-Settings-Tauren-p3-Default-default-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 13254.05193
-  tps: 9479.92847
+  dps: 13050.93286
+  tps: 9315.14759
  }
 }
 dps_results: {
  key: "TestFeralApl-Settings-Tauren-p3-Default-default-NoBuffs-LongMultiTarget"
  value: {
-  dps: 7190.91844
-  tps: 5172.48616
+  dps: 7083.67635
+  tps: 5088.49168
  }
 }
 dps_results: {
  key: "TestFeralApl-Settings-Tauren-p3-Default-default-NoBuffs-LongSingleTarget"
  value: {
-  dps: 7190.91844
-  tps: 5172.48616
+  dps: 7083.67635
+  tps: 5088.49168
  }
 }
 dps_results: {
  key: "TestFeralApl-Settings-Tauren-p3-Default-default-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 7724.94375
-  tps: 5553.88773
+  dps: 7578.66914
+  tps: 5429.46642
  }
 }
 dps_results: {
  key: "TestFeralApl-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 4134.32776
-  tps: 2945.31934
+  dps: 3096.09321
+  tps: 2210.11726
  }
 }
diff --git a/ui/core/components/exporters.ts b/ui/core/components/exporters.ts
index 59c03a3b55..31a0229ca6 100644
--- a/ui/core/components/exporters.ts
+++ b/ui/core/components/exporters.ts
@@ -199,7 +199,7 @@ export class IndividualWowheadGearPlannerExporter<SpecType extends Spec> extends
 					slotId = slotId | 0b10000000;
 				}
 				bytes.push(slotId);
-				bytes.push(item.curGems(isBlacksmithing).length << 5);
+				bytes.push(item.curEquippedGems(isBlacksmithing).length << 5);
 				bytes = bytes.concat(to2Bytes(item.item.id));
 
 				if (item.enchant) {
diff --git a/ui/core/proto_utils/equipped_item.ts b/ui/core/proto_utils/equipped_item.ts
index 427fc3ae74..27dc4555b3 100644
--- a/ui/core/proto_utils/equipped_item.ts
+++ b/ui/core/proto_utils/equipped_item.ts
@@ -244,8 +244,11 @@ export class EquippedItem {
 		return this.hasExtraSocket(isBlacksmithing) ? this._item.gemSockets.concat([GemColor.GemColorPrismatic]) : this._item.gemSockets;
 	}
 
-	curGems(isBlacksmithing: boolean): Array<Gem> {
-		return (this._gems.filter(g => g != null) as Array<Gem>).slice(0, this.numSockets(isBlacksmithing));
+	curGems(isBlacksmithing: boolean): Array<Gem|null> {
+		return this._gems.slice(0, this.numSockets(isBlacksmithing));
+	}
+	curEquippedGems(isBlacksmithing: boolean): Array<Gem> {
+		return this.curGems(isBlacksmithing).filter(g => g != null) as Array<Gem>;
 	}
 
 	getProfessionRequirements(): Array<Profession> {
diff --git a/ui/core/proto_utils/gear.ts b/ui/core/proto_utils/gear.ts
index a242fdfefe..bc5cb807e7 100644
--- a/ui/core/proto_utils/gear.ts
+++ b/ui/core/proto_utils/gear.ts
@@ -170,7 +170,7 @@ export class Gear extends BaseGear {
 
 	getAllGems(isBlacksmithing: boolean): Array<Gem> {
 		return this.asArray()
-			.map(ei => ei == null ? [] : ei.curGems(isBlacksmithing))
+			.map(ei => ei == null ? [] : ei.curEquippedGems(isBlacksmithing))
 			.flat();
 	}
 
@@ -377,7 +377,7 @@ export class ItemSwapGear extends BaseGear {
 		return SimDatabase.create({
 			items: distinct(equippedItems.map(ei => ItemSwapGear.itemToDB(ei.item))),
 			enchants: distinct(equippedItems.filter(ei => ei.enchant).map(ei => ItemSwapGear.enchantToDB(ei.enchant!))),
-			gems: distinct(equippedItems.map(ei => ei.curGems(true).map(gem => ItemSwapGear.gemToDB(gem))).flat()),
+			gems: distinct(equippedItems.map(ei => ei.curEquippedGems(true).map(gem => ItemSwapGear.gemToDB(gem))).flat()),
 		});
 	}
 }
diff --git a/ui/feral_druid/apls/default.apl.json b/ui/feral_druid/apls/default.apl.json
index b99372654b..81e4b2a96a 100644
--- a/ui/feral_druid/apls/default.apl.json
+++ b/ui/feral_druid/apls/default.apl.json
@@ -5,16 +5,15 @@
   ],
   "priorityList": [
     {"action":{"autocastOtherCooldowns":{}}},
-    {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":16870}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"80"}}}}]}},"castSpell":{"spellId":{"spellId":16857}}}},
     {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"30"}}}},"castSpell":{"spellId":{"spellId":50213}}}},
-    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":52610}}},"rhs":{"const":{"val":"1s"}}}},"castSpell":{"spellId":{"spellId":52610}}}},
-    {"action":{"condition":{"auraShouldRefresh":{"auraId":{"spellId":48566},"maxOverlap":{"const":{"val":"0ms"}}}},"castSpell":{"spellId":{"spellId":48566}}}},
-    {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":16870}}},"castSpell":{"spellId":{"spellId":48572}}}},
-    {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":49800}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"4"}}}}]}},"castSpell":{"spellId":{"spellId":49800}}}},
-    {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":49800}}},"rhs":{"const":{"val":"4s"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":50334}}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"30"}}}}]}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":52610}}},"rhs":{"const":{"val":"4s"}}}}]}},"castSpell":{"spellId":{"spellId":48577}}}},
-    {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":48574}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"9"}}}}]}},"castSpell":{"spellId":{"spellId":48574}}}},
-    {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"50"}}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"85"}}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":50213}}},"rhs":{"const":{"val":"15s"}}}}]}},"castSpell":{"spellId":{"spellId":50334}}}},
-    {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":48572}}}},
-    {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"85"}}}},{"auraIsActive":{"auraId":{"spellId":50334}}}]}},"castSpell":{"spellId":{"spellId":48572}}}}
+    {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":16870}}}}},{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":49800}}}}},{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}}]}},"castSpell":{"spellId":{"spellId":49800}}}},
+    {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":16857}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":16870}}}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":50334}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"15"}}}}]}},{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":50334}}}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"87"}}}}]}}]}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{}}}]}},"castSpell":{"spellId":{"spellId":16857}}}},
+    {"action":{"condition":{"and":{"vals":[{"spellCanCast":{"spellId":{"spellId":50334}}},{"cmp":{"op":"OpGt","lhs":{"spellTimeToReady":{"spellId":{"spellId":50213}}},"rhs":{"const":{"val":"15s"}}}},{"dotIsActive":{"spellId":{"spellId":49800}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":16870}}}}}]}},"castSpell":{"spellId":{"spellId":50334}}}},
+    {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"1"}}}},{"or":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":52610}}}}},{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":49800}}},{"cmp":{"op":"OpGt","lhs":{"math":{"op":"OpSub","lhs":{"remainingTime":{}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":49800}}}}},"rhs":{"const":{"val":"10s"}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":52610}}},"rhs":{"math":{"op":"OpAdd","lhs":{"dotRemainingTime":{"spellId":{"spellId":49800}}},"rhs":{"const":{"val":"4s"}}}}}},{"cmp":{"op":"OpLt","lhs":{"auraRemainingTime":{"auraId":{"spellId":52610}}},"rhs":{"remainingTime":{}}}},{"cmp":{"op":"OpGe","lhs":{"catNewSavageRoarDuration":{}},"rhs":{"math":{"op":"OpAdd","lhs":{"dotRemainingTime":{"spellId":{"spellId":49800}}},"rhs":{"const":{"val":"25s"}}}}}}]}}]}}]}},"castSpell":{"spellId":{"spellId":52610}}}},
+    {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpEq","lhs":{"currentComboPoints":{}},"rhs":{"const":{"val":"5"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":16870}}}}},{"or":{"vals":[{"and":{"vals":[{"auraIsActive":{"auraId":{"spellId":50334}}},{"cmp":{"op":"OpLe","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"25"}}}}]}},{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":50334}}}}},{"cmp":{"op":"OpLt","lhs":{"currentEnergy":{}},"rhs":{"const":{"val":"67"}}}}]}}]}},{"or":{"vals":[{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":49800}}},{"auraIsActive":{"auraId":{"spellId":52610}}},{"cmp":{"op":"OpGe","lhs":{"dotRemainingTime":{"spellId":{"spellId":49800}}},"rhs":{"const":{"val":"4s"}}}},{"cmp":{"op":"OpGe","lhs":{"auraRemainingTime":{"auraId":{"spellId":52610}}},"rhs":{"const":{"val":"4s"}}}}]}},{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":49800}}},{"cmp":{"op":"OpLt","lhs":{"math":{"op":"OpSub","lhs":{"remainingTime":{}},"rhs":{"dotRemainingTime":{"spellId":{"spellId":49800}}}}},"rhs":{"const":{"val":"10s"}}}}]}},{"cmp":{"op":"OpLt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"10s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":48577}}}},
+    {"action":{"condition":{"and":{"vals":[{"auraShouldRefresh":{"auraId":{"spellId":48566},"maxOverlap":{"const":{"val":"1s"}}}},{"not":{"val":{"auraIsActive":{"auraId":{"spellId":16870}}}}}]}},"castSpell":{"spellId":{"spellId":48566}}}},
+    {"action":{"condition":{"and":{"vals":[{"not":{"val":{"auraIsActive":{"auraId":{"spellId":16870}}}}},{"not":{"val":{"dotIsActive":{"spellId":{"spellId":48574}}}}},{"cmp":{"op":"OpGt","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"9s"}}}}]}},"castSpell":{"spellId":{"spellId":48574}}}},
+    {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":16870}}},{"cmp":{"op":"OpGe","lhs":{"catExcessEnergy":{}},"rhs":{"const":{"val":"120"}}}}]}},{"cmp":{"op":"OpEq","lhs":{"const":{"val":"1"}},"rhs":{"const":{"val":"0"}}}}]}},"castSpell":{"spellId":{"spellId":48566}}}},
+    {"action":{"condition":{"and":{"vals":[{"or":{"vals":[{"auraIsActive":{"auraId":{"spellId":16870}}},{"cmp":{"op":"OpGe","lhs":{"catExcessEnergy":{}},"rhs":{"const":{"val":"42s"}}}}]}}]}},"castSpell":{"spellId":{"spellId":48572}}}}
   ]
-}
+}
\ No newline at end of file