diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results
index cc98198ef9..bb8dce337b 100644
--- a/sim/mage/TestFire.results
+++ b/sim/mage/TestFire.results
@@ -812,8 +812,8 @@ dps_results: {
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-FireRotation-FullBuffs-LongMultiTarget"
  value: {
-  dps: 9901.87827
-  tps: 9950.61256
+  dps: 9821.10427
+  tps: 10007.24054
  }
 }
 dps_results: {
diff --git a/sim/mage/TestFrostFire.results b/sim/mage/TestFrostFire.results
index 6a270289cd..cda26b26c5 100644
--- a/sim/mage/TestFrostFire.results
+++ b/sim/mage/TestFrostFire.results
@@ -46,725 +46,725 @@ character_stats_results: {
 dps_results: {
  key: "TestFrostFire-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 6270.1932
-  tps: 4992.23738
+  dps: 6159.78847
+  tps: 4922.69137
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 6304.81022
-  tps: 5019.51279
+  dps: 6193.77956
+  tps: 4949.46556
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 6189.30443
-  tps: 4926.49095
+  dps: 6099.60706
+  tps: 4875.57897
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 5988.44011
-  tps: 4770.25043
-  hps: 94.59432
+  dps: 5875.19208
+  tps: 4698.38129
+  hps: 94.57337
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 5988.44011
-  tps: 4770.25043
-  hps: 94.59432
+  dps: 5875.19208
+  tps: 4698.38129
+  hps: 94.57337
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 6229.90277
-  tps: 4959.19443
+  dps: 6132.79345
+  tps: 4900.69651
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5016.72522
-  tps: 4002.09638
+  dps: 5019.58493
+  tps: 4010.99441
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Bloodmage'sRegalia"
  value: {
-  dps: 6959.00035
-  tps: 5542.93365
+  dps: 6907.21986
+  tps: 5520.67315
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 6228.34202
-  tps: 4859.33912
+  dps: 6138.06684
+  tps: 4809.40532
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 6409.91705
-  tps: 5103.02389
+  dps: 6308.53608
+  tps: 5042.0864
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
   hps: 64
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 6083.53626
-  tps: 4847.94724
+  dps: 5981.7765
+  tps: 4785.63554
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 6154.95821
-  tps: 4915.648
+  dps: 6050.37774
+  tps: 4850.91604
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 6102.14026
-  tps: 4862.80022
+  dps: 6088.8458
+  tps: 4855.32113
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Death'sChoice-47464"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 6023.3877
-  tps: 4798.17295
+  dps: 5924.80362
+  tps: 4739.50532
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Defender'sCode-40257"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 6232.05313
-  tps: 4960.85239
+  dps: 6148.88708
+  tps: 4914.7678
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 6478.29174
-  tps: 5164.26076
+  dps: 6375.42691
+  tps: 5098.31678
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 6425.48247
-  tps: 5119.41052
+  dps: 6318.40366
+  tps: 5052.53429
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 6189.30443
-  tps: 4926.49095
+  dps: 6099.60706
+  tps: 4875.57897
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 6240.21543
-  tps: 4966.95428
+  dps: 6159.81547
+  tps: 4921.73008
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 6226.74772
-  tps: 4956.48842
+  dps: 6128.61611
+  tps: 4898.15043
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 6223.30845
-  tps: 4953.72748
+  dps: 6125.97643
+  tps: 4896.39591
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 6094.17426
-  tps: 4852.62297
+  dps: 6004.50438
+  tps: 4800.21351
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 6189.30443
-  tps: 4926.49095
+  dps: 6099.60706
+  tps: 4875.57897
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 6174.53725
-  tps: 4927.93283
+  dps: 6067.19109
+  tps: 4862.51253
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6307.2177
-  tps: 5024.28806
+  dps: 6189.25612
+  tps: 4950.02845
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 6010.13393
-  tps: 4790.04331
+  dps: 5887.03208
+  tps: 4708.54484
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 6163.19516
-  tps: 4907.93156
+  dps: 6054.72508
+  tps: 4839.93479
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6220.99034
-  tps: 4956.40314
+  dps: 6112.52978
+  tps: 4889.78337
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 6228.34202
-  tps: 4957.22799
+  dps: 6138.06684
+  tps: 4905.85532
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 6220.5345
-  tps: 4951.08058
+  dps: 6130.37489
+  tps: 4899.80005
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-FrostfireGarb"
  value: {
-  dps: 5633.64337
-  tps: 4485.18782
+  dps: 5554.11454
+  tps: 4434.228
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6109.32099
-  tps: 4864.55005
+  dps: 6011.0354
+  tps: 4806.10852
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Gladiator'sRegalia"
  value: {
-  dps: 6182.8495
-  tps: 4915.1818
+  dps: 6059.50663
+  tps: 4837.15624
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 6287.50171
-  tps: 5005.87509
+  dps: 6176.78402
+  tps: 4936.07846
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 6326.83922
-  tps: 5036.86987
+  dps: 6215.41026
+  tps: 4966.50368
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 6137.62348
-  tps: 4896.96348
+  dps: 6035.24157
+  tps: 4832.8818
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Heartpierce-49982"
  value: {
-  dps: 6409.91705
-  tps: 5103.02389
+  dps: 6308.53608
+  tps: 5042.0864
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Heartpierce-50641"
  value: {
-  dps: 6409.91705
-  tps: 5103.02389
+  dps: 6308.53608
+  tps: 5042.0864
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6290.45129
-  tps: 5009.88403
+  dps: 6179.44909
+  tps: 4939.85957
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 6226.74772
-  tps: 4956.48842
+  dps: 6128.61611
+  tps: 4898.15043
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 6223.30845
-  tps: 4953.72748
+  dps: 6125.97643
+  tps: 4896.39591
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-IncisorFragment-37723"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 6205.13418
-  tps: 4945.12891
+  dps: 6166.57657
+  tps: 4922.34366
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 6189.30443
-  tps: 4926.49095
+  dps: 6099.60706
+  tps: 4875.57897
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Khadgar'sRegalia"
  value: {
-  dps: 6343.91889
-  tps: 5049.67828
+  dps: 6246.30503
+  tps: 4993.01116
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-KirinTorGarb"
  value: {
-  dps: 6393.17366
-  tps: 5082.29396
+  dps: 6326.85241
+  tps: 5045.15905
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6118.14034
-  tps: 4873.899
+  dps: 6035.9848
+  tps: 4819.90282
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 6070.8149
-  tps: 4836.54612
+  dps: 5969.03319
+  tps: 4775.31449
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 6243.0827
-  tps: 4972.21688
+  dps: 6122.72537
+  tps: 4896.04263
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Nibelung-49992"
  value: {
-  dps: 6409.91705
-  tps: 5103.02389
+  dps: 6308.53608
+  tps: 5042.0864
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Nibelung-50648"
  value: {
-  dps: 6409.91705
-  tps: 5103.02389
+  dps: 6308.53608
+  tps: 5042.0864
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 6189.30443
-  tps: 4926.49095
+  dps: 6099.60706
+  tps: 4875.57897
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 6189.30443
-  tps: 4926.49095
+  dps: 6099.60706
+  tps: 4875.57897
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 6189.30443
-  tps: 4926.49095
+  dps: 6099.60706
+  tps: 4875.57897
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 6189.30443
-  tps: 4926.49095
+  dps: 6099.60706
+  tps: 4875.57897
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6435.04853
-  tps: 5161.04919
+  dps: 6323.13376
+  tps: 5090.45864
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6486.34906
-  tps: 5206.33037
+  dps: 6373.26974
+  tps: 5134.67052
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 6370.62084
-  tps: 5071.54409
+  dps: 6277.79677
+  tps: 5018.13074
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 6191.01839
-  tps: 4927.88372
+  dps: 6101.71347
+  tps: 4875.15713
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 6237.05123
-  tps: 4970.89323
+  dps: 6144.78983
+  tps: 4909.13338
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 6268.51839
-  tps: 4996.36931
+  dps: 6205.03595
+  tps: 4955.96154
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SoulPreserver-37111"
  value: {
-  dps: 6106.54914
-  tps: 4863.29906
+  dps: 5999.10328
+  tps: 4796.12248
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SouloftheDead-40382"
  value: {
-  dps: 6107.94471
-  tps: 4874.271
+  dps: 6054.87156
+  tps: 4838.72693
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SparkofLife-37657"
  value: {
-  dps: 6071.14995
-  tps: 4835.55894
+  dps: 5957.87611
+  tps: 4763.38415
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 6129.83156
-  tps: 4881.39503
+  dps: 6038.77564
+  tps: 4829.13295
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 6189.30443
-  tps: 4926.49095
+  dps: 6099.60706
+  tps: 4875.57897
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 6189.30443
-  tps: 4926.49095
+  dps: 6099.60706
+  tps: 4875.57897
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 6189.30443
-  tps: 4926.49095
+  dps: 6099.60706
+  tps: 4875.57897
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 6049.73287
-  tps: 4819.46214
+  dps: 5959.06389
+  tps: 4763.94562
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 6035.47293
-  tps: 4808.1178
+  dps: 5958.49855
+  tps: 4761.21278
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TempestRegalia"
  value: {
-  dps: 4496.03625
-  tps: 3592.69621
+  dps: 4493.40144
+  tps: 3591.5043
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 5988.5366
-  tps: 4770.3147
+  dps: 5883.22454
+  tps: 4704.84683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5146.56056
-  tps: 4103.63967
+  dps: 5098.81509
+  tps: 4085.10228
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6189.30443
-  tps: 4926.49095
+  dps: 6099.60706
+  tps: 4875.57897
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 6189.07498
-  tps: 4927.69904
+  dps: 6110.39682
+  tps: 4884.21417
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 6189.07498
-  tps: 4927.69904
+  dps: 6110.39682
+  tps: 4884.21417
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 6228.34202
-  tps: 4957.22799
+  dps: 6138.06684
+  tps: 4905.85532
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 6220.5345
-  tps: 4951.08058
+  dps: 6130.37489
+  tps: 4899.80005
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 6211.32434
-  tps: 4947.49404
+  dps: 6090.33301
+  tps: 4870.916
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 6220.5345
-  tps: 4951.08058
+  dps: 6130.37489
+  tps: 4899.80005
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 6228.34202
-  tps: 4957.22799
+  dps: 6138.06684
+  tps: 4905.85532
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-WingedTalisman-37844"
  value: {
-  dps: 6114.33102
-  tps: 4870.95024
+  dps: 6007.18779
+  tps: 4804.01743
  }
 }
 dps_results: {
  key: "TestFrostFire-Average-Default"
  value: {
-  dps: 6467.08075
-  tps: 5149.38156
+  dps: 6354.09318
+  tps: 5078.67204
  }
 }
 dps_results: {
@@ -777,8 +777,8 @@ dps_results: {
 dps_results: {
  key: "TestFrostFire-Settings-Troll-P1FrostFire-FrostFireRotation-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6450.84976
-  tps: 5137.28295
+  dps: 6326.12814
+  tps: 5052.38832
  }
 }
 dps_results: {
@@ -812,7 +812,7 @@ dps_results: {
 dps_results: {
  key: "TestFrostFire-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6409.91705
-  tps: 5103.02389
+  dps: 6308.53608
+  tps: 5042.0864
  }
 }
diff --git a/sim/mage/evocation.go b/sim/mage/evocation.go
index da956a0627..ed420a4592 100644
--- a/sim/mage/evocation.go
+++ b/sim/mage/evocation.go
@@ -8,27 +8,18 @@ import (
 
 const EvocationId = 12051
 
-func (mage *Mage) registerEvocationCD() {
+func (mage *Mage) registerEvocation(numTicks int32) *core.Spell {
 	actionID := core.ActionID{SpellID: EvocationId}
 	manaMetrics := mage.NewManaMetrics(actionID)
 
-	maxTicks := core.TernaryInt32(mage.HasSetBonus(ItemSetTempestRegalia, 2), 5, 4)
-
-	numTicks := core.MaxInt32(0, core.MinInt32(maxTicks, mage.Options.EvocationTicks))
-	if numTicks == 0 {
-		numTicks = maxTicks
-	}
-
 	channelTime := time.Duration(numTicks) * time.Second * 2
 	manaPerTick := 0.0
-	manaThreshold := 0.0
 	mage.Env.RegisterPostFinalizeEffect(func() {
 		manaPerTick = mage.MaxMana() * 0.15
-		manaThreshold = mage.MaxMana() * 0.3
 	})
 
-	evocationSpell := mage.RegisterSpell(core.SpellConfig{
-		ActionID: actionID,
+	return mage.GetOrRegisterSpell(core.SpellConfig{
+		ActionID: actionID.WithTag(numTicks),
 		Flags:    core.SpellFlagAPL,
 
 		Cast: core.CastConfig{
@@ -53,6 +44,22 @@ func (mage *Mage) registerEvocationCD() {
 			})
 		},
 	})
+}
+
+func (mage *Mage) registerEvocationCD() {
+	maxTicks := core.TernaryInt32(mage.HasSetBonus(ItemSetTempestRegalia, 2), 5, 4)
+
+	numTicks := core.MaxInt32(0, core.MinInt32(maxTicks, mage.Options.EvocationTicks))
+	if numTicks == 0 {
+		numTicks = maxTicks
+	}
+
+	manaThreshold := 0.0
+	mage.Env.RegisterPostFinalizeEffect(func() {
+		manaThreshold = mage.MaxMana() * 0.3
+	})
+
+	evocationSpell := mage.registerEvocation(numTicks)
 
 	mage.AddMajorCooldown(core.MajorCooldown{
 		Spell: evocationSpell,
@@ -72,3 +79,11 @@ func (mage *Mage) registerEvocationCD() {
 		},
 	})
 }
+
+func (mage *Mage) registerEvocationSpells() {
+	maxTicks := core.TernaryInt32(mage.HasSetBonus(ItemSetTempestRegalia, 2), 5, 4)
+
+	for i := int32(1); i <= maxTicks; i++ {
+		mage.registerEvocation(i)
+	}
+}
diff --git a/sim/mage/mage.go b/sim/mage/mage.go
index 6be22565e4..f9a67fae9d 100644
--- a/sim/mage/mage.go
+++ b/sim/mage/mage.go
@@ -131,11 +131,14 @@ func (mage *Mage) Initialize() {
 	mage.registerScorchSpell()
 	mage.registerLivingBombSpell()
 	mage.registerFrostfireBoltSpell()
-
-	mage.registerEvocationCD()
+	mage.registerEvocationSpells()
 	mage.registerManaGemsCD()
 	mage.registerMirrorImageCD()
 
+	if !mage.IsUsingAPL {
+		mage.registerEvocationCD()
+	}
+
 	if mirrorImageMCD := mage.GetMajorCooldownIgnoreTag(mage.MirrorImage.ActionID); mirrorImageMCD != nil {
 		if len(mirrorImageMCD.GetTimings()) == 0 {
 			mage.RegisterPrepullAction(-1500*time.Millisecond, func(sim *core.Simulation) {
diff --git a/ui/core/proto_utils/action_id.ts b/ui/core/proto_utils/action_id.ts
index 9ba0425b18..8871323075 100644
--- a/ui/core/proto_utils/action_id.ts
+++ b/ui/core/proto_utils/action_id.ts
@@ -249,6 +249,19 @@ export class ActionId {
 			case 'Living Bomb':
 				if (this.spellId == 55362) name += ' (Explosion)';
 				break;
+			case 'Evocation':
+				if (this.tag == 1) {
+					name += ' (1 Tick)';
+				} else if (this.tag == 2) {
+					name += ' (2 Tick)';
+				} else if (this.tag == 3) {
+					name += ' (3 Tick)';
+				} else if (this.tag == 4) {
+					name += ' (4 Tick)';
+				} else if (this.tag == 5) {
+					name += ' (5 Tick)';
+				}
+				break;
 			case 'Mind Flay':
 				if (this.tag == 1) {
 					name += ' (1 Tick)';
diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts
index de2bfeda3d..5aae8eea1d 100644
--- a/ui/mage/presets.ts
+++ b/ui/mage/presets.ts
@@ -198,8 +198,7 @@ export const ARCANE_ROTATION_PRESET_DEFAULT = {
 			  {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":12472}}}}},"castSpell":{"spellId":{"itemId":40211}}}},
 			  {"action":{"condition":{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":36032}}},"rhs":{"const":{"val":"4"}}}},"castSpell":{"spellId":{"spellId":42897}}}},
 			  {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":44401}}},"castSpell":{"spellId":{"spellId":42846}}}},
-			  {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"25%"}}}},"castSpell":{"spellId":{"spellId":12051}}}},
-			  {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"25%"}}}},"castSpell":{"spellId":{"spellId":42897}}}},
+			  {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"25%"}}}},"castSpell":{"spellId":{"spellId":12051,"tag":1}}}},			  {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"25%"}}}},"castSpell":{"spellId":{"spellId":42897}}}},
 			  {"action":{"castSpell":{"spellId":{"spellId":42846}}}}
 			]
 		}`)
@@ -263,7 +262,7 @@ export const FROST_ROTATION_PRESET_DEFAULT = {
 			  {"action":{"autocastOtherCooldowns":{}}},
 			  {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":12472}}}}},"castSpell":{"spellId":{"spellId":26297}}}},
 			  {"action":{"condition":{"not":{"val":{"auraIsActive":{"auraId":{"spellId":12472}}}}},"castSpell":{"spellId":{"spellId":54758}}}},
-			  {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"25%"}}}},"castSpell":{"spellId":{"spellId":12051}}}},
+              {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"25%"}}}},"castSpell":{"spellId":{"spellId":12051,"tag":1}}}},
 			  {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":44545}}},"castSpell":{"spellId":{"spellId":44572}}}},
 			  {"action":{"condition":{"auraIsActive":{"auraId":{"spellId":44549}}},"castSpell":{"spellId":{"spellId":47610}}}},
 			  {"action":{"castSpell":{"spellId":{"spellId":42842}}}}