diff --git a/sim/core/database.go b/sim/core/database.go
index 9a863231c2..303e76aa2e 100644
--- a/sim/core/database.go
+++ b/sim/core/database.go
@@ -2,7 +2,6 @@ package core
 
 import (
 	"fmt"
-
 	"github.com/wowsims/wotlk/sim/core/proto"
 	"github.com/wowsims/wotlk/sim/core/stats"
 	"google.golang.org/protobuf/encoding/protojson"
@@ -397,7 +396,7 @@ func ColorIntersects(g proto.GemColor, o proto.GemColor) bool {
 		return true
 	}
 	if g == proto.GemColor_GemColorMeta {
-		return false // meta gems o nothing.
+		return o == proto.GemColor_GemColorUnknown
 	}
 	if g == proto.GemColor_GemColorRed {
 		return o == proto.GemColor_GemColorOrange || o == proto.GemColor_GemColorPurple
diff --git a/sim/deathknight/ghoul_frenzy.go b/sim/deathknight/ghoul_frenzy.go
index ba7d624f1c..3b65aa7bdc 100644
--- a/sim/deathknight/ghoul_frenzy.go
+++ b/sim/deathknight/ghoul_frenzy.go
@@ -66,7 +66,7 @@ func (dk *Deathknight) registerGhoulFrenzySpell() {
 		Label:    "Ghoul Frenzy",
 		Duration: time.Second * 30.0,
 		OnReset: func(aura *core.Aura, sim *core.Simulation) {
-			if dk.Inputs.PrecastGhoulFrenzy {
+			if !dk.IsUsingAPL && dk.Inputs.PrecastGhoulFrenzy {
 				dk.GhoulFrenzyAura.Activate(sim)
 				dk.GhoulFrenzyAura.UpdateExpires(sim.CurrentTime + time.Second*20)
 			}
@@ -78,7 +78,7 @@ func (dk *Deathknight) registerGhoulFrenzySpell() {
 		Label:    "Ghoul Frenzy",
 		Duration: time.Second * 30.0,
 		OnReset: func(aura *core.Aura, sim *core.Simulation) {
-			if dk.Inputs.PrecastGhoulFrenzy {
+			if !dk.IsUsingAPL && dk.Inputs.PrecastGhoulFrenzy {
 				dk.Ghoul.GhoulFrenzyAura.Activate(sim)
 				dk.Ghoul.GhoulFrenzyAura.UpdateExpires(sim.CurrentTime + time.Second*20)
 			}
diff --git a/sim/deathknight/horn_of_winter.go b/sim/deathknight/horn_of_winter.go
index 1c2214aa07..c0dc19983d 100644
--- a/sim/deathknight/horn_of_winter.go
+++ b/sim/deathknight/horn_of_winter.go
@@ -21,7 +21,7 @@ func (dk *Deathknight) registerHornOfWinterSpell() {
 		ActionID: actionID,
 		Duration: duration,
 		OnReset: func(aura *core.Aura, sim *core.Simulation) {
-			if dk.Inputs.PrecastHornOfWinter && dk.Inputs.RefreshHornOfWinter {
+			if !dk.IsUsingAPL && dk.Inputs.PrecastHornOfWinter && dk.Inputs.RefreshHornOfWinter {
 				aura.Activate(sim)
 			}
 		},
@@ -52,7 +52,7 @@ func (dk *Deathknight) registerHornOfWinterSpell() {
 			IgnoreHaste: true,
 		},
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
-			if dk.Inputs.RefreshHornOfWinter {
+			if !dk.IsUsingAPL && dk.Inputs.RefreshHornOfWinter {
 				dk.HornOfWinterAura.Activate(sim)
 			}
 			dk.AddRunicPower(sim, 10, rpMetrics)
diff --git a/sim/druid/balance/TestBalancePhase3.results b/sim/druid/balance/TestBalancePhase3.results
index 89e75e4a2d..caae782bb2 100644
--- a/sim/druid/balance/TestBalancePhase3.results
+++ b/sim/druid/balance/TestBalancePhase3.results
@@ -523,8 +523,8 @@ dps_results: {
 dps_results: {
  key: "TestBalancePhase3-AllItems-LasherweaveRegalia"
  value: {
-  dps: 10121.88915
-  tps: 9902.7564
+  dps: 10122.42199
+  tps: 9903.28923
  }
 }
 dps_results: {
diff --git a/sim/druid/items.go b/sim/druid/items.go
index 1ab5a73b58..3f40593da9 100644
--- a/sim/druid/items.go
+++ b/sim/druid/items.go
@@ -109,8 +109,8 @@ var ItemSetLasherweaveRegalia = core.NewItemSet(core.ItemSet{
 					},
 				},
 				ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
+					spell.SpellMetrics[target.UnitIndex].Hits++
 					spell.Dot(target).ApplyOrReset(sim)
-					spell.CalcAndDealOutcome(sim, target, spell.OutcomeAlwaysHit)
 				},
 			})
 
diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results
index daa8efe2b8..2b203965d7 100644
--- a/sim/mage/TestArcane.results
+++ b/sim/mage/TestArcane.results
@@ -46,725 +46,725 @@ character_stats_results: {
 dps_results: {
  key: "TestArcane-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 7321.32111
-  tps: 4415.13414
+  dps: 7262.75725
+  tps: 4372.10285
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 7356.28955
-  tps: 4435.79282
+  dps: 7297.48136
+  tps: 4392.61405
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 7266.69563
-  tps: 4381.11865
+  dps: 7202.18891
+  tps: 4335.9026
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 7022.30674
-  tps: 4239.39433
-  hps: 96.02226
+  dps: 6961.78746
+  tps: 4194.59495
+  hps: 97.53276
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 7022.30674
-  tps: 4239.39433
-  hps: 96.02226
+  dps: 6961.78746
+  tps: 4194.59495
+  hps: 97.53276
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 7306.0831
-  tps: 4403.45535
+  dps: 7253.09969
+  tps: 4366.55557
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5953.001
-  tps: 3597.9113
+  dps: 5885.73462
+  tps: 3545.79842
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Bloodmage'sRegalia"
  value: {
-  dps: 8055.26258
-  tps: 4858.13964
+  dps: 7933.61563
+  tps: 4773.54829
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 7306.39451
-  tps: 4318.30484
+  dps: 7241.61772
+  tps: 4273.70224
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 7474.16034
-  tps: 4505.53575
+  dps: 7410.63457
+  tps: 4460.81569
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
   hps: 64
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7126.02684
-  tps: 4300.33257
+  dps: 7077.53578
+  tps: 4263.30874
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7142.04537
-  tps: 4330.73504
+  dps: 7083.47514
+  tps: 4287.02366
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 7249.78322
-  tps: 4378.15798
+  dps: 7213.87012
+  tps: 4347.73676
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Death'sChoice-47464"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7065.35759
-  tps: 4264.17901
+  dps: 7009.89788
+  tps: 4222.94027
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 7298.71338
-  tps: 4400.26757
+  dps: 7238.64026
+  tps: 4357.6191
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 7574.99368
-  tps: 4569.93396
+  dps: 7540.3207
+  tps: 4540.35033
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 7469.2549
-  tps: 4509.22884
+  dps: 7459.85004
+  tps: 4494.61448
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 7266.69563
-  tps: 4381.11865
+  dps: 7202.18891
+  tps: 4335.9026
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 7353.75908
-  tps: 4431.56959
+  dps: 7286.17392
+  tps: 4386.12747
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 7293.34394
-  tps: 4397.04591
+  dps: 7232.30105
+  tps: 4353.81558
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 7291.13212
-  tps: 4395.71882
+  dps: 7226.99591
+  tps: 4350.63249
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7070.44304
-  tps: 4266.16194
+  dps: 7055.52599
+  tps: 4252.76348
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 7266.69563
-  tps: 4381.11865
+  dps: 7202.18891
+  tps: 4335.9026
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7121.61888
-  tps: 4297.51717
+  dps: 7074.41145
+  tps: 4261.26353
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7321.88216
-  tps: 4416.73435
+  dps: 7274.20496
+  tps: 4380.121
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 7114.22171
-  tps: 4297.20282
+  dps: 7014.08994
+  tps: 4230.71058
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 7213.23683
-  tps: 4351.28001
+  dps: 7155.42817
+  tps: 4308.70458
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7237.80589
-  tps: 4367.00219
+  dps: 7185.59126
+  tps: 4327.66663
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 7306.39451
-  tps: 4404.56656
+  dps: 7241.61772
+  tps: 4359.18459
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 7298.45473
-  tps: 4399.87698
+  dps: 7233.73195
+  tps: 4354.52819
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-FrostfireGarb"
  value: {
-  dps: 6753.82014
-  tps: 4076.62993
+  dps: 6672.51099
+  tps: 4020.47921
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7143.42875
-  tps: 4311.11023
+  dps: 7117.4729
+  tps: 4288.13673
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Gladiator'sRegalia"
  value: {
-  dps: 7097.35534
-  tps: 4277.6585
+  dps: 7010.33897
+  tps: 4212.68266
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 7338.80533
-  tps: 4425.46348
+  dps: 7280.11931
+  tps: 4382.35845
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 7378.5422
-  tps: 4448.93926
+  dps: 7319.57853
+  tps: 4405.66664
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 7123.70958
-  tps: 4313.80484
+  dps: 7060.32431
+  tps: 4267.84141
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Heartpierce-49982"
  value: {
-  dps: 7474.16034
-  tps: 4505.53575
+  dps: 7410.63457
+  tps: 4460.81569
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Heartpierce-50641"
  value: {
-  dps: 7474.16034
-  tps: 4505.53575
+  dps: 7410.63457
+  tps: 4460.81569
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7340.90308
-  tps: 4427.95981
+  dps: 7283.39516
+  tps: 4385.56125
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 7293.34394
-  tps: 4397.04591
+  dps: 7232.30105
+  tps: 4353.81558
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 7291.13212
-  tps: 4395.71882
+  dps: 7226.99591
+  tps: 4350.63249
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-IncisorFragment-37723"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 7350.46598
-  tps: 4435.64652
+  dps: 7324.40238
+  tps: 4415.40239
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 7266.69563
-  tps: 4381.11865
+  dps: 7202.18891
+  tps: 4335.9026
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Khadgar'sRegalia"
  value: {
-  dps: 7206.48859
-  tps: 4343.42781
+  dps: 7165.07605
+  tps: 4311.55161
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-KirinTorGarb"
  value: {
-  dps: 7128.29833
-  tps: 4292.59543
+  dps: 7072.92883
+  tps: 4253.2668
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7196.89454
-  tps: 4345.02791
+  dps: 7205.85329
+  tps: 4340.84148
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 7096.69139
-  tps: 4282.70727
+  dps: 7048.70022
+  tps: 4245.91394
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7262.37839
-  tps: 4380.76495
+  dps: 7215.07559
+  tps: 4344.49303
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Nibelung-49992"
  value: {
-  dps: 7474.16034
-  tps: 4505.53575
+  dps: 7410.63457
+  tps: 4460.81569
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Nibelung-50648"
  value: {
-  dps: 7474.16034
-  tps: 4505.53575
+  dps: 7410.63457
+  tps: 4460.81569
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 7266.69563
-  tps: 4381.11865
+  dps: 7202.18891
+  tps: 4335.9026
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 7266.69563
-  tps: 4381.11865
+  dps: 7202.18891
+  tps: 4335.9026
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 7266.69563
-  tps: 4381.11865
+  dps: 7202.18891
+  tps: 4335.9026
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 7266.69563
-  tps: 4381.11865
+  dps: 7202.18891
+  tps: 4335.9026
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7450.45673
-  tps: 4569.50233
+  dps: 7401.40778
+  tps: 4530.7438
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7502.63856
-  tps: 4610.0111
+  dps: 7453.06559
+  tps: 4570.78817
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 7445.12294
-  tps: 4488.17503
+  dps: 7377.83548
+  tps: 4441.29054
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 7275.21134
-  tps: 4384.989
+  dps: 7228.02718
+  tps: 4351.29722
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 7329.29569
-  tps: 4427.64237
+  dps: 7297.01565
+  tps: 4401.03645
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 7369.80395
-  tps: 4452.22293
+  dps: 7342.41554
+  tps: 4426.84874
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SoulPreserver-37111"
  value: {
-  dps: 7156.01575
-  tps: 4317.47489
+  dps: 7098.6069
+  tps: 4275.1408
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SouloftheDead-40382"
  value: {
-  dps: 7188.10485
-  tps: 4344.68137
+  dps: 7144.7136
+  tps: 4312.65245
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SparkofLife-37657"
  value: {
-  dps: 7132.6142
-  tps: 4305.77735
+  dps: 7095.56639
+  tps: 4275.10679
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 7187.54169
-  tps: 4337.69445
+  dps: 7167.0499
+  tps: 4316.48973
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 7266.69563
-  tps: 4381.11865
+  dps: 7202.18891
+  tps: 4335.9026
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 7266.69563
-  tps: 4381.11865
+  dps: 7202.18891
+  tps: 4335.9026
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 7266.69563
-  tps: 4381.11865
+  dps: 7202.18891
+  tps: 4335.9026
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 7095.90001
-  tps: 4283.54498
+  dps: 7049.69773
+  tps: 4248.87462
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 7127.12693
-  tps: 4300.28122
+  dps: 7107.94262
+  tps: 4286.99927
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TempestRegalia"
  value: {
-  dps: 5380.53895
-  tps: 3263.77558
+  dps: 5383.6804
+  tps: 3253.99727
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 7036.80515
-  tps: 4247.04755
+  dps: 6980.22924
+  tps: 4205.21624
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 6141.31694
-  tps: 3716.56088
+  dps: 6102.39604
+  tps: 3684.17223
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 7266.69563
-  tps: 4381.11865
+  dps: 7202.18891
+  tps: 4335.9026
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 7233.04755
-  tps: 4361.90917
+  dps: 7164.87258
+  tps: 4313.78083
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 7233.04755
-  tps: 4361.90917
+  dps: 7164.87258
+  tps: 4313.78083
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 7306.39451
-  tps: 4404.56656
+  dps: 7241.61772
+  tps: 4359.18459
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 7298.45473
-  tps: 4399.87698
+  dps: 7233.73195
+  tps: 4354.52819
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7163.00044
-  tps: 4321.31841
+  dps: 7102.24972
+  tps: 4277.81155
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 7298.45473
-  tps: 4399.87698
+  dps: 7233.73195
+  tps: 4354.52819
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 7306.39451
-  tps: 4404.56656
+  dps: 7241.61772
+  tps: 4359.18459
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7173.55029
-  tps: 4329.09464
+  dps: 7114.80914
+  tps: 4285.96418
  }
 }
 dps_results: {
  key: "TestArcane-Average-Default"
  value: {
-  dps: 7542.35563
-  tps: 4549.54193
+  dps: 7451.90236
+  tps: 4484.70324
  }
 }
 dps_results: {
@@ -777,15 +777,15 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Settings-Troll-P1Arcane-AOE-FullBuffs-LongSingleTarget"
  value: {
-  dps: 1440.71027
-  tps: 892.82666
+  dps: 1415.44271
+  tps: 861.93669
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-P1Arcane-AOE-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 2460.06416
-  tps: 1403.67222
+  dps: 2477.32135
+  tps: 1402.19696
  }
 }
 dps_results: {
@@ -798,63 +798,63 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Settings-Troll-P1Arcane-AOE-NoBuffs-LongSingleTarget"
  value: {
-  dps: 728.83139
-  tps: 471.06047
+  dps: 710.21571
+  tps: 446.69995
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-P1Arcane-AOE-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 1528.78012
-  tps: 937.62337
+  dps: 1529.46713
+  tps: 932.88919
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-P1Arcane-ArcaneRotation-FullBuffs-LongMultiTarget"
  value: {
-  dps: 7474.16034
-  tps: 6243.66891
+  dps: 7410.63457
+  tps: 6077.08827
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-P1Arcane-ArcaneRotation-FullBuffs-LongSingleTarget"
  value: {
-  dps: 7474.16034
-  tps: 4505.53575
+  dps: 7410.63457
+  tps: 4460.81569
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-P1Arcane-ArcaneRotation-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9808.9837
-  tps: 5806.93203
+  dps: 9833.20595
+  tps: 5815.53698
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-P1Arcane-ArcaneRotation-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3528.81558
-  tps: 3486.21313
+  dps: 3460.41391
+  tps: 3298.15262
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-P1Arcane-ArcaneRotation-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3528.81558
-  tps: 2140.36177
+  dps: 3460.41391
+  tps: 2091.79716
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-P1Arcane-ArcaneRotation-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4702.11826
-  tps: 2816.6271
+  dps: 5017.0646
+  tps: 2931.92428
  }
 }
 dps_results: {
  key: "TestArcane-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7474.16034
-  tps: 4505.53575
+  dps: 7410.63457
+  tps: 4460.81569
  }
 }
diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results
index ffcda1ac78..f5e06c5c76 100644
--- a/sim/mage/TestFire.results
+++ b/sim/mage/TestFire.results
@@ -46,815 +46,815 @@ character_stats_results: {
 dps_results: {
  key: "TestFire-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 6536.93794
-  tps: 5225.51072
+  dps: 6534.80126
+  tps: 5225.15489
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 6572.41279
-  tps: 5253.46792
+  dps: 6570.21466
+  tps: 5253.07024
  }
 }
 dps_results: {
  key: "TestFire-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 6541.23773
-  tps: 5230.61935
+  dps: 6469.64646
+  tps: 5173.84469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 6259.51451
-  tps: 5007.47961
-  hps: 94.41021
+  dps: 6268.82247
+  tps: 5015.79289
+  hps: 94.61364
  }
 }
 dps_results: {
  key: "TestFire-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 6259.51451
-  tps: 5007.47961
-  hps: 94.41021
+  dps: 6268.82247
+  tps: 5015.79289
+  hps: 94.61364
  }
 }
 dps_results: {
  key: "TestFire-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 6602.11242
-  tps: 5282.00729
+  dps: 6566.07434
+  tps: 5252.22713
  }
 }
 dps_results: {
  key: "TestFire-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5003.45311
-  tps: 3996.29039
+  dps: 4951.42201
+  tps: 3954.87837
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Bloodmage'sRegalia"
  value: {
-  dps: 7237.95107
-  tps: 5786.96164
+  dps: 7179.31923
+  tps: 5739.36838
  }
 }
 dps_results: {
  key: "TestFire-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 6581.85237
-  tps: 5159.069
+  dps: 6509.82709
+  tps: 5103.08693
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 6733.71935
-  tps: 5384.40184
+  dps: 6666.04192
+  tps: 5331.42606
  }
 }
 dps_results: {
  key: "TestFire-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
   hps: 64
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 6386.215
-  tps: 5108.35266
+  dps: 6418.06693
+  tps: 5136.23828
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 6472.75158
-  tps: 5188.27214
+  dps: 6436.57447
+  tps: 5161.00385
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 6497.23853
-  tps: 5201.23315
+  dps: 6482.54159
+  tps: 5189.63965
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Death'sChoice-47464"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 6267.88177
-  tps: 5012.56784
+  dps: 6313.10352
+  tps: 5051.56077
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Defender'sCode-40257"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 6567.91074
-  tps: 5251.83743
+  dps: 6498.19343
+  tps: 5197.41833
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 6608.61763
-  tps: 5286.79637
+  dps: 6525.07439
+  tps: 5218.41386
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 6510.36588
-  tps: 5206.77989
+  dps: 6493.41712
+  tps: 5193.82707
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 6541.23773
-  tps: 5230.61935
+  dps: 6469.64646
+  tps: 5173.84469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 6649.46906
-  tps: 5319.37096
+  dps: 6573.03147
+  tps: 5256.7686
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 6550.88131
-  tps: 5238.1314
+  dps: 6486.77937
+  tps: 5188.01602
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 6553.08757
-  tps: 5240.02311
+  dps: 6484.87639
+  tps: 5186.38771
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 6356.51194
-  tps: 5086.10212
+  dps: 6300.84311
+  tps: 5040.92179
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 6541.23773
-  tps: 5230.61935
+  dps: 6469.64646
+  tps: 5173.84469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 6453.21141
-  tps: 5171.69548
+  dps: 6458.50754
+  tps: 5176.42806
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6603.34793
-  tps: 5280.82801
+  dps: 6628.39668
+  tps: 5302.10882
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 6333.16703
-  tps: 5070.9352
+  dps: 6377.03608
+  tps: 5106.76787
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 6427.28842
-  tps: 5139.09755
+  dps: 6425.34166
+  tps: 5138.87107
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6488.89095
-  tps: 5190.0756
+  dps: 6548.68197
+  tps: 5239.62416
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 6581.85237
-  tps: 5262.61962
+  dps: 6509.82709
+  tps: 5205.50379
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 6573.72944
-  tps: 5256.21957
+  dps: 6501.79096
+  tps: 5199.17197
  }
 }
 dps_results: {
  key: "TestFire-AllItems-FrostfireGarb"
  value: {
-  dps: 5982.59126
-  tps: 4787.42855
+  dps: 5996.06798
+  tps: 4798.72185
  }
 }
 dps_results: {
  key: "TestFire-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6433.9595
-  tps: 5145.67746
+  dps: 6465.43615
+  tps: 5171.18705
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Gladiator'sRegalia"
  value: {
-  dps: 6484.76873
-  tps: 5178.30774
+  dps: 6495.36616
+  tps: 5185.04376
  }
 }
 dps_results: {
  key: "TestFire-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 6554.67536
-  tps: 5239.48932
+  dps: 6552.50796
+  tps: 5239.11256
  }
 }
 dps_results: {
  key: "TestFire-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 6594.98769
-  tps: 5271.25886
+  dps: 6592.75046
+  tps: 5270.83456
  }
 }
 dps_results: {
  key: "TestFire-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 6462.06307
-  tps: 5178.03796
+  dps: 6441.46881
+  tps: 5161.35445
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Heartpierce-49982"
  value: {
-  dps: 6733.71935
-  tps: 5384.40184
+  dps: 6666.04192
+  tps: 5331.42606
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Heartpierce-50641"
  value: {
-  dps: 6733.71935
-  tps: 5384.40184
+  dps: 6666.04192
+  tps: 5331.42606
  }
 }
 dps_results: {
  key: "TestFire-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6557.08617
-  tps: 5243.11085
+  dps: 6554.53588
+  tps: 5242.43111
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 6550.88131
-  tps: 5238.1314
+  dps: 6486.77937
+  tps: 5188.01602
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 6553.08757
-  tps: 5240.02311
+  dps: 6484.87639
+  tps: 5186.38771
  }
 }
 dps_results: {
  key: "TestFire-AllItems-IncisorFragment-37723"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 6600.64145
-  tps: 5284.74778
+  dps: 6579.34651
+  tps: 5268.08179
  }
 }
 dps_results: {
  key: "TestFire-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 6541.23773
-  tps: 5230.61935
+  dps: 6469.64646
+  tps: 5173.84469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Khadgar'sRegalia"
  value: {
-  dps: 6721.37842
-  tps: 5374.65042
+  dps: 6749.14423
+  tps: 5396.25085
  }
 }
 dps_results: {
  key: "TestFire-AllItems-KirinTorGarb"
  value: {
-  dps: 6799.35104
-  tps: 5430.94248
+  dps: 6766.27832
+  tps: 5405.06664
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6525.59029
-  tps: 5219.91214
+  dps: 6545.12
+  tps: 5237.55258
  }
 }
 dps_results: {
  key: "TestFire-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 6338.33346
-  tps: 5069.74682
+  dps: 6394.70575
+  tps: 5116.70294
  }
 }
 dps_results: {
  key: "TestFire-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 6507.27281
-  tps: 5204.13426
+  dps: 6513.04565
+  tps: 5209.19051
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Nibelung-49992"
  value: {
-  dps: 6733.71935
-  tps: 5384.40184
+  dps: 6666.04192
+  tps: 5331.42606
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Nibelung-50648"
  value: {
-  dps: 6733.71935
-  tps: 5384.40184
+  dps: 6666.04192
+  tps: 5331.42606
  }
 }
 dps_results: {
  key: "TestFire-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 6541.23773
-  tps: 5230.61935
+  dps: 6469.64646
+  tps: 5173.84469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 6541.23773
-  tps: 5230.61935
+  dps: 6469.64646
+  tps: 5173.84469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 6541.23773
-  tps: 5230.61935
+  dps: 6469.64646
+  tps: 5173.84469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 6541.23773
-  tps: 5230.61935
+  dps: 6469.64646
+  tps: 5173.84469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6746.05813
-  tps: 5425.81548
+  dps: 6704.10608
+  tps: 5391.31764
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6794.85813
-  tps: 5468.37728
+  dps: 6752.76713
+  tps: 5433.783
  }
 }
 dps_results: {
  key: "TestFire-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 6723.25538
-  tps: 5376.23348
+  dps: 6647.74768
+  tps: 5316.32566
  }
 }
 dps_results: {
  key: "TestFire-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 6547.16282
-  tps: 5236.21755
+  dps: 6500.86746
+  tps: 5198.82769
  }
 }
 dps_results: {
  key: "TestFire-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 6624.22825
-  tps: 5301.56544
+  dps: 6596.47425
+  tps: 5279.36391
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 6648.17821
-  tps: 5320.38231
+  dps: 6637.50554
+  tps: 5311.73404
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SoulPreserver-37111"
  value: {
-  dps: 6369.23867
-  tps: 5093.3494
+  dps: 6367.39246
+  tps: 5093.1914
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SouloftheDead-40382"
  value: {
-  dps: 6501.55231
-  tps: 5209.49786
+  dps: 6524.32793
+  tps: 5227.33539
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SparkofLife-37657"
  value: {
-  dps: 6422.14382
-  tps: 5137.8912
+  dps: 6428.49085
+  tps: 5142.6259
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 6436.09749
-  tps: 5148.2253
+  dps: 6361.39158
+  tps: 5087.69759
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 6541.23773
-  tps: 5230.61935
+  dps: 6469.64646
+  tps: 5173.84469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 6541.23773
-  tps: 5230.61935
+  dps: 6469.64646
+  tps: 5173.84469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 6541.23773
-  tps: 5230.61935
+  dps: 6469.64646
+  tps: 5173.84469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 6401.19353
-  tps: 5121.7025
+  dps: 6371.27917
+  tps: 5096.39657
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 6401.88187
-  tps: 5123.74958
+  dps: 6437.73852
+  tps: 5153.00247
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TempestRegalia"
  value: {
-  dps: 4587.96145
-  tps: 3666.35336
+  dps: 4623.11492
+  tps: 3697.33974
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 6248.30169
-  tps: 4998.04077
+  dps: 6246.66496
+  tps: 4998.02543
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5354.64084
-  tps: 4290.07499
+  dps: 5299.33808
+  tps: 4245.17635
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6541.23773
-  tps: 5230.61935
+  dps: 6469.64646
+  tps: 5173.84469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 6472.878
-  tps: 5176.2788
+  dps: 6476.68751
+  tps: 5180.35503
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 6472.878
-  tps: 5176.2788
+  dps: 6476.68751
+  tps: 5180.35503
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 6581.85237
-  tps: 5262.61962
+  dps: 6509.82709
+  tps: 5205.50379
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 6573.72944
-  tps: 5256.21957
+  dps: 6501.79096
+  tps: 5199.17197
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 6426.28522
-  tps: 5140.06185
+  dps: 6400.77673
+  tps: 5121.16941
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 6573.72944
-  tps: 5256.21957
+  dps: 6501.79096
+  tps: 5199.17197
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 6581.85237
-  tps: 5262.61962
+  dps: 6509.82709
+  tps: 5205.50379
  }
 }
 dps_results: {
  key: "TestFire-AllItems-WingedTalisman-37844"
  value: {
-  dps: 6378.26
-  tps: 5102.00741
+  dps: 6381.58571
+  tps: 5105.96202
  }
 }
 dps_results: {
  key: "TestFire-Average-Default"
  value: {
-  dps: 6867.79964
-  tps: 5492.38858
+  dps: 6841.95828
+  tps: 5471.46232
  }
 }
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-AOE-FullBuffs-LongMultiTarget"
  value: {
   dps: 22668.84493
-  tps: 24132.57944
+  tps: 24108.36901
  }
 }
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-AOE-FullBuffs-LongSingleTarget"
  value: {
-  dps: 1842.94921
-  tps: 1616.58673
+  dps: 1856.19748
+  tps: 1629.23894
  }
 }
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-AOE-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 2583.21709
-  tps: 2167.40643
+  dps: 2581.51745
+  tps: 2165.97677
  }
 }
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-AOE-NoBuffs-LongMultiTarget"
  value: {
   dps: 14446.79738
-  tps: 16158.25233
+  tps: 16154.91987
  }
 }
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-AOE-NoBuffs-LongSingleTarget"
  value: {
-  dps: 851.76994
-  tps: 742.73894
+  dps: 855.85503
+  tps: 745.79357
  }
 }
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-AOE-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 1462.84582
-  tps: 1191.3684
+  dps: 1463.20066
+  tps: 1191.68976
  }
 }
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-FireRotation-FullBuffs-LongMultiTarget"
  value: {
-  dps: 9823.45749
-  tps: 10214.40161
+  dps: 9891.21129
+  tps: 10074.24546
  }
 }
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-FireRotation-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6733.71935
-  tps: 5384.40184
+  dps: 6666.04192
+  tps: 5331.42606
  }
 }
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-FireRotation-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8154.00104
-  tps: 6427.43618
+  dps: 8151.46347
+  tps: 6425.40612
  }
 }
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-FireRotation-NoBuffs-LongMultiTarget"
  value: {
-  dps: 4832.03892
-  tps: 5516.51403
+  dps: 4759.88064
+  tps: 5449.2759
  }
 }
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-FireRotation-NoBuffs-LongSingleTarget"
  value: {
-  dps: 2489.04624
-  tps: 1983.24614
+  dps: 2483.31099
+  tps: 1980.21442
  }
 }
 dps_results: {
  key: "TestFire-Settings-Troll-P1Fire-FireRotation-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3803.56404
-  tps: 2946.34195
+  dps: 3799.50796
+  tps: 2943.10154
  }
 }
 dps_results: {
  key: "TestFire-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6733.71935
-  tps: 5384.40184
+  dps: 6666.04192
+  tps: 5331.42606
  }
 }
diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results
index 71ad650425..d6d1cec457 100644
--- a/sim/mage/TestFrost.results
+++ b/sim/mage/TestFrost.results
@@ -770,15 +770,15 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Settings-Troll-P1Frost-AOE-FullBuffs-LongMultiTarget"
  value: {
-  dps: 12045.63043
-  tps: 11294.51046
+  dps: 12052.57938
+  tps: 11280.31542
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Troll-P1Frost-AOE-FullBuffs-LongSingleTarget"
  value: {
-  dps: 1792.56565
-  tps: 1078.27513
+  dps: 1792.42689
+  tps: 1078.13961
  }
 }
 dps_results: {
@@ -791,22 +791,22 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Settings-Troll-P1Frost-AOE-NoBuffs-LongMultiTarget"
  value: {
-  dps: 5652.25801
-  tps: 5390.73315
+  dps: 5636.29226
+  tps: 5372.07612
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Troll-P1Frost-AOE-NoBuffs-LongSingleTarget"
  value: {
-  dps: 955.61139
-  tps: 503.96162
+  dps: 957.22024
+  tps: 502.28946
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Troll-P1Frost-AOE-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 1606.4397
-  tps: 1062.87093
+  dps: 1711.13491
+  tps: 1062.80935
  }
 }
 dps_results: {
@@ -833,15 +833,15 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Settings-Troll-P1Frost-FrostRotation-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3227.22119
-  tps: 3280.0317
+  dps: 3225.34806
+  tps: 3276.9822
  }
 }
 dps_results: {
  key: "TestFrost-Settings-Troll-P1Frost-FrostRotation-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3227.22119
-  tps: 2520.08271
+  dps: 3225.34806
+  tps: 2516.75911
  }
 }
 dps_results: {
diff --git a/sim/mage/TestFrostFire.results b/sim/mage/TestFrostFire.results
index 6777a2e123..c34d066368 100644
--- a/sim/mage/TestFrostFire.results
+++ b/sim/mage/TestFrostFire.results
@@ -46,773 +46,773 @@ character_stats_results: {
 dps_results: {
  key: "TestFrostFire-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 6159.78847
-  tps: 4922.69137
+  dps: 6205.65443
+  tps: 4950.69643
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 6193.77956
-  tps: 4949.46556
+  dps: 6239.91272
+  tps: 4977.68398
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 6099.60706
-  tps: 4875.57897
+  dps: 6160.08095
+  tps: 4911.38507
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 5875.19208
-  tps: 4698.38129
-  hps: 94.57337
+  dps: 5925.05863
+  tps: 4729.66537
+  hps: 94.63921
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 5875.19208
-  tps: 4698.38129
-  hps: 94.57337
+  dps: 5925.05863
+  tps: 4729.66537
+  hps: 94.63921
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 6132.79345
-  tps: 4900.69651
+  dps: 6213.63521
+  tps: 4951.43655
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5019.58493
-  tps: 4010.99441
+  dps: 4995.36165
+  tps: 3991.40916
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Bloodmage'sRegalia"
  value: {
-  dps: 6907.21986
-  tps: 5520.67315
+  dps: 6938.52225
+  tps: 5544.05221
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 6138.06684
-  tps: 4809.40532
+  dps: 6198.94292
+  tps: 4844.56311
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 6308.53608
-  tps: 5042.0864
+  dps: 6376.09828
+  tps: 5084.23177
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
   hps: 64
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 5981.7765
-  tps: 4785.63554
+  dps: 6047.11096
+  tps: 4828.94902
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 6050.37774
-  tps: 4850.91604
+  dps: 6107.47026
+  tps: 4886.86219
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 6088.8458
-  tps: 4855.32113
+  dps: 6100.70046
+  tps: 4861.73742
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Death'sChoice-47464"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 5924.80362
-  tps: 4739.50532
+  dps: 5963.10172
+  tps: 4763.25959
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Defender'sCode-40257"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 6148.88708
-  tps: 4914.7678
+  dps: 6192.14412
+  tps: 4938.20929
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 6375.42691
-  tps: 5098.31678
+  dps: 6408.43838
+  tps: 5123.81963
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 6318.40366
-  tps: 5052.53429
+  dps: 6347.18054
+  tps: 5075.32968
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 6099.60706
-  tps: 4875.57897
+  dps: 6160.08095
+  tps: 4911.38507
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 6159.81547
-  tps: 4921.73008
+  dps: 6230.53788
+  tps: 4964.44838
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 6128.61611
-  tps: 4898.15043
+  dps: 6193.78146
+  tps: 4938.37832
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 6125.97643
-  tps: 4896.39591
+  dps: 6190.30879
+  tps: 4935.59065
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 6004.50438
-  tps: 4800.21351
+  dps: 6035.577
+  tps: 4822.63064
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 6099.60706
-  tps: 4875.57897
+  dps: 6160.08095
+  tps: 4911.38507
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 6067.19109
-  tps: 4862.51253
+  dps: 6123.00201
+  tps: 4896.05112
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6189.25612
-  tps: 4950.02845
+  dps: 6253.99284
+  tps: 4993.02063
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 5887.03208
-  tps: 4708.54484
+  dps: 5986.85985
+  tps: 4774.56007
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 6054.72508
-  tps: 4839.93479
+  dps: 6099.76514
+  tps: 4867.28035
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6112.52978
-  tps: 4889.78337
+  dps: 6164.71687
+  tps: 4923.73457
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 6138.06684
-  tps: 4905.85532
+  dps: 6198.94292
+  tps: 4941.9816
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 6130.37489
-  tps: 4899.80005
+  dps: 6191.17052
+  tps: 4935.8623
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-FrostfireGarb"
  value: {
-  dps: 5554.11454
-  tps: 4434.228
+  dps: 5629.25226
+  tps: 4482.67758
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6011.0354
-  tps: 4806.10852
+  dps: 6057.35518
+  tps: 4833.35556
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Gladiator'sRegalia"
  value: {
-  dps: 6059.50663
-  tps: 4837.15624
+  dps: 6116.12394
+  tps: 4872.28139
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 6176.78402
-  tps: 4936.07846
+  dps: 6222.78357
+  tps: 4964.1902
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 6215.41026
-  tps: 4966.50368
+  dps: 6261.71346
+  tps: 4994.85788
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 6035.24157
-  tps: 4832.8818
+  dps: 6089.52943
+  tps: 4867.77966
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Heartpierce-49982"
  value: {
-  dps: 6308.53608
-  tps: 5042.0864
+  dps: 6376.09828
+  tps: 5084.23177
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Heartpierce-50641"
  value: {
-  dps: 6308.53608
-  tps: 5042.0864
+  dps: 6376.09828
+  tps: 5084.23177
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6179.44909
-  tps: 4939.85957
+  dps: 6225.5701
+  tps: 4968.0683
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 6128.61611
-  tps: 4898.15043
+  dps: 6193.78146
+  tps: 4938.37832
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 6125.97643
-  tps: 4896.39591
+  dps: 6190.30879
+  tps: 4935.59065
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-IncisorFragment-37723"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 6166.57657
-  tps: 4922.34366
+  dps: 6204.274
+  tps: 4944.55527
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 6099.60706
-  tps: 4875.57897
+  dps: 6160.08095
+  tps: 4911.38507
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Khadgar'sRegalia"
  value: {
-  dps: 6246.30503
-  tps: 4993.01116
+  dps: 6295.70339
+  tps: 5017.52267
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-KirinTorGarb"
  value: {
-  dps: 6326.85241
-  tps: 5045.15905
+  dps: 6361.49024
+  tps: 5063.1764
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6035.9848
-  tps: 4819.90282
+  dps: 6113.78406
+  tps: 4871.5147
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 5969.03319
-  tps: 4775.31449
+  dps: 6023.2804
+  tps: 4809.83255
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 6122.72537
-  tps: 4896.04263
+  dps: 6179.28982
+  tps: 4933.52186
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Nibelung-49992"
  value: {
-  dps: 6308.53608
-  tps: 5042.0864
+  dps: 6376.09828
+  tps: 5084.23177
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Nibelung-50648"
  value: {
-  dps: 6308.53608
-  tps: 5042.0864
+  dps: 6376.09828
+  tps: 5084.23177
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 6099.60706
-  tps: 4875.57897
+  dps: 6160.08095
+  tps: 4911.38507
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 6099.60706
-  tps: 4875.57897
+  dps: 6160.08095
+  tps: 4911.38507
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 6099.60706
-  tps: 4875.57897
+  dps: 6160.08095
+  tps: 4911.38507
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 6099.60706
-  tps: 4875.57897
+  dps: 6160.08095
+  tps: 4911.38507
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6323.13376
-  tps: 5090.45864
+  dps: 6361.4927
+  tps: 5117.31133
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6373.26974
-  tps: 5134.67052
+  dps: 6412.17766
+  tps: 5162.04155
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 6277.79677
-  tps: 5018.13074
+  dps: 6340.59607
+  tps: 5055.79716
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 6101.71347
-  tps: 4875.15713
+  dps: 6160.60819
+  tps: 4911.83964
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 6144.78983
-  tps: 4909.13338
+  dps: 6236.71052
+  tps: 4970.64061
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 6205.03595
-  tps: 4955.96154
+  dps: 6268.17768
+  tps: 4996.11669
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SoulPreserver-37111"
  value: {
-  dps: 5999.10328
-  tps: 4796.12248
+  dps: 6043.70611
+  tps: 4823.1189
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SouloftheDead-40382"
  value: {
-  dps: 6054.87156
-  tps: 4838.72693
+  dps: 6108.24956
+  tps: 4874.58762
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SparkofLife-37657"
  value: {
-  dps: 5957.87611
-  tps: 4763.38415
+  dps: 6057.1386
+  tps: 4826.53585
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 6038.77564
-  tps: 4829.13295
+  dps: 6081.23105
+  tps: 4851.8242
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 6099.60706
-  tps: 4875.57897
+  dps: 6160.08095
+  tps: 4911.38507
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 6099.60706
-  tps: 4875.57897
+  dps: 6160.08095
+  tps: 4911.38507
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 6099.60706
-  tps: 4875.57897
+  dps: 6160.08095
+  tps: 4911.38507
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 5959.06389
-  tps: 4763.94562
+  dps: 6031.43997
+  tps: 4808.98782
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 5958.49855
-  tps: 4761.21278
+  dps: 6033.58152
+  tps: 4807.68526
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TempestRegalia"
  value: {
-  dps: 4493.40144
-  tps: 3591.5043
+  dps: 4500.6622
+  tps: 3600.3356
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 5883.22454
-  tps: 4704.84683
+  dps: 5926.91647
+  tps: 4731.11587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5098.81509
-  tps: 4085.10228
+  dps: 5082.56654
+  tps: 4067.98952
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6099.60706
-  tps: 4875.57897
+  dps: 6160.08095
+  tps: 4911.38507
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 6110.39682
-  tps: 4884.21417
+  dps: 6155.59586
+  tps: 4910.26942
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 6110.39682
-  tps: 4884.21417
+  dps: 6155.59586
+  tps: 4910.26942
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 6138.06684
-  tps: 4905.85532
+  dps: 6198.94292
+  tps: 4941.9816
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 6130.37489
-  tps: 4899.80005
+  dps: 6191.17052
+  tps: 4935.8623
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 6090.33301
-  tps: 4870.916
+  dps: 6127.45071
+  tps: 4896.90824
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 6130.37489
-  tps: 4899.80005
+  dps: 6191.17052
+  tps: 4935.8623
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 6138.06684
-  tps: 4905.85532
+  dps: 6198.94292
+  tps: 4941.9816
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-WingedTalisman-37844"
  value: {
-  dps: 6007.18779
-  tps: 4804.01743
+  dps: 6047.48439
+  tps: 4827.57021
  }
 }
 dps_results: {
  key: "TestFrostFire-Average-Default"
  value: {
-  dps: 6354.09318
-  tps: 5078.67204
+  dps: 6412.6051
+  tps: 5115.59318
  }
 }
 dps_results: {
  key: "TestFrostFire-Settings-Troll-P1FrostFire-FrostFireRotation-FullBuffs-LongMultiTarget"
  value: {
-  dps: 9231.00799
-  tps: 9179.0138
+  dps: 9232.12928
+  tps: 9183.60979
  }
 }
 dps_results: {
  key: "TestFrostFire-Settings-Troll-P1FrostFire-FrostFireRotation-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6308.53608
-  tps: 5042.0864
+  dps: 6376.09828
+  tps: 5084.23177
  }
 }
 dps_results: {
  key: "TestFrostFire-Settings-Troll-P1FrostFire-FrostFireRotation-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7378.96003
-  tps: 5796.4892
+  dps: 7375.01249
+  tps: 5793.70003
  }
 }
 dps_results: {
  key: "TestFrostFire-Settings-Troll-P1FrostFire-FrostFireRotation-NoBuffs-LongMultiTarget"
  value: {
-  dps: 4903.30866
-  tps: 5571.01283
+  dps: 4902.58444
+  tps: 5583.14731
  }
 }
 dps_results: {
  key: "TestFrostFire-Settings-Troll-P1FrostFire-FrostFireRotation-NoBuffs-LongSingleTarget"
  value: {
-  dps: 2650.47412
-  tps: 2114.43191
+  dps: 2605.84408
+  tps: 2078.22412
  }
 }
 dps_results: {
  key: "TestFrostFire-Settings-Troll-P1FrostFire-FrostFireRotation-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3158.21612
-  tps: 2426.14
+  dps: 3154.73621
+  tps: 2423.42337
  }
 }
 dps_results: {
  key: "TestFrostFire-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6308.53608
-  tps: 5042.0864
+  dps: 6376.09828
+  tps: 5084.23177
  }
 }
diff --git a/sim/mage/evocation.go b/sim/mage/evocation.go
index ed420a4592..e4449e163a 100644
--- a/sim/mage/evocation.go
+++ b/sim/mage/evocation.go
@@ -56,7 +56,7 @@ func (mage *Mage) registerEvocationCD() {
 
 	manaThreshold := 0.0
 	mage.Env.RegisterPostFinalizeEffect(func() {
-		manaThreshold = mage.MaxMana() * 0.3
+		manaThreshold = mage.MaxMana() * 0.1
 	})
 
 	evocationSpell := mage.registerEvocation(numTicks)
diff --git a/sim/mage/ignite.go b/sim/mage/ignite.go
index 185c45aef6..98e3967aff 100644
--- a/sim/mage/ignite.go
+++ b/sim/mage/ignite.go
@@ -60,8 +60,8 @@ func (mage *Mage) applyIgnite() {
 		},
 
 		ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) {
+			spell.SpellMetrics[target.UnitIndex].Hits++
 			spell.Dot(target).ApplyOrReset(sim)
-			spell.CalcAndDealOutcome(sim, target, spell.OutcomeAlwaysHit)
 		},
 	})
 }