diff --git a/sim/core/aura.go b/sim/core/aura.go
index 39b79f5ce6..67ddeaf056 100644
--- a/sim/core/aura.go
+++ b/sim/core/aura.go
@@ -18,6 +18,7 @@ type OnReset func(aura *Aura, sim *Simulation)
 type OnDoneIteration func(aura *Aura, sim *Simulation)
 type OnGain func(aura *Aura, sim *Simulation)
 type OnExpire func(aura *Aura, sim *Simulation)
+type OnRestore func(aura *Aura, sim *Simulation, state AuraState)
 type OnStacksChange func(aura *Aura, sim *Simulation, oldStacks int32, newStacks int32)
 type OnEncounterStart func(aura *Aura, sim *Simulation)
 
@@ -87,6 +88,7 @@ type Aura struct {
 	OnDoneIteration OnDoneIteration
 	OnGain          OnGain
 	OnExpire        OnExpire
+	OnRestore       OnRestore
 	OnStacksChange  OnStacksChange // Invoked when the number of stacks of this aura changes.
 
 	OnApplyEffects        OnApplyEffects   // Invoked when a spell cast is completing, before apply effects are called
@@ -647,6 +649,10 @@ restart:
 // Adds a new aura to the simulation. If an aura with the same ID already
 // exists it will be replaced with the new one.
 func (aura *Aura) Activate(sim *Simulation) {
+	aura.activate(sim, true)
+}
+
+func (aura *Aura) activate(sim *Simulation, triggerOnGain bool) {
 	if aura == nil {
 		return
 	}
@@ -748,7 +754,7 @@ func (aura *Aura) Activate(sim *Simulation) {
 	}
 
 	// don't invoke possible callbacks until the internal state is consistent
-	if aura.OnGain != nil {
+	if triggerOnGain && aura.OnGain != nil {
 		aura.OnGain(aura, sim)
 	}
 }
@@ -1148,8 +1154,21 @@ func (aura *Aura) SaveState(sim *Simulation) AuraState {
 }
 
 func (aura *Aura) RestoreState(state AuraState, sim *Simulation) {
-	if !aura.active {
-		aura.Activate(sim)
+	// If the aura has an OnRestore callback, we need special handling to properly
+	// restart any periodic actions without causing issues like double-stacking.
+	if aura.OnRestore != nil {
+		// Deactivate first to cancel any existing periodic actions
+		if aura.active {
+			aura.Deactivate(sim)
+		}
+		// Activate without triggering OnGain's immediate effects
+		aura.activate(sim, false)
+		// Then call the restore callback to restart periodic actions properly
+		aura.OnRestore(aura, sim, state)
+	} else {
+		if !aura.active {
+			aura.Activate(sim)
+		}
 	}
 
 	aura.UpdateExpires(state.RemainingDuration + sim.CurrentTime)
diff --git a/sim/core/aura_helpers.go b/sim/core/aura_helpers.go
index 3710758c0f..b2aa7ab52b 100644
--- a/sim/core/aura_helpers.go
+++ b/sim/core/aura_helpers.go
@@ -341,6 +341,25 @@ func (character *Character) NewTemporaryStatBuffWithStacks(config TemporaryStatB
 	})
 
 	if config.TimePerStack > 0 {
+		var pa *PendingAction
+
+		startStackingAction := func(sim *Simulation, tickImmediately bool, numTicks int) {
+			pa = StartPeriodicAction(sim, PeriodicActionOptions{
+				Period:          config.TimePerStack,
+				NumTicks:        numTicks,
+				TickImmediately: tickImmediately,
+				OnAction: func(sim *Simulation) {
+					if stackingAura.IsActive() {
+						if config.DecrementStacks {
+							stackingAura.RemoveStack(sim)
+						} else {
+							stackingAura.AddStack(sim)
+						}
+					}
+				},
+			})
+		}
+
 		aura := character.RegisterAura(Aura{
 			Label:    config.AuraLabel,
 			ActionID: config.ActionID,
@@ -352,21 +371,24 @@ func (character *Character) NewTemporaryStatBuffWithStacks(config TemporaryStatB
 					stackingAura.SetStacks(sim, config.MaxStacks)
 				}
 
-				StartPeriodicAction(sim, PeriodicActionOptions{
-					Period:          config.TimePerStack,
-					NumTicks:        int(config.MaxStacks),
-					TickImmediately: config.TickImmediately,
-					OnAction: func(sim *Simulation) {
-						// Aura might not be active because of stuff like mage alter time being cast right before this aura being activated
-						if stackingAura.IsActive() {
-							if config.DecrementStacks {
-								stackingAura.RemoveStack(sim)
-							} else {
-								stackingAura.AddStack(sim)
-							}
-						}
-					},
-				})
+				startStackingAction(sim, config.TickImmediately, int(config.MaxStacks))
+			},
+			OnExpire: func(aura *Aura, sim *Simulation) {
+				if pa != nil {
+					pa.Cancel(sim)
+					pa = nil
+				}
+			},
+			OnRestore: func(aura *Aura, sim *Simulation, state AuraState) {
+				// When restoring (e.g., via Alter Time), we need to restart the periodic action
+				// but without TickImmediately to avoid adding an extra stack.
+				// Note: We don't activate the stacking aura here because it will be restored
+				// separately by Alter Time's restoration loop with the correct duration.
+
+				remainingTicks := int(config.MaxStacks - state.Stacks)
+				if remainingTicks > 0 {
+					startStackingAction(sim, false, remainingTicks)
+				}
 			},
 		})
 		return stackingAura, aura
diff --git a/sim/mage/arcane/TestArcane.results b/sim/mage/arcane/TestArcane.results
index d9565ab49f..508ba9c7dc 100644
--- a/sim/mage/arcane/TestArcane.results
+++ b/sim/mage/arcane/TestArcane.results
@@ -33,701 +33,701 @@ character_stats_results: {
 dps_results: {
  key: "TestArcane-AllItems-AgilePrimalDiamond"
  value: {
-  dps: 242669.23358
-  tps: 233965.66327
+  dps: 240017.65139
+  tps: 231461.75952
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-AssuranceofConsequence-105472"
  value: {
-  dps: 229379.37127
-  tps: 221056.27575
+  dps: 227578.24244
+  tps: 219282.17487
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-AusterePrimalDiamond"
  value: {
-  dps: 239540.23339
-  tps: 230960.78748
+  dps: 236953.6178
+  tps: 228519.14354
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BlackBloodofY'Shaarj-105648"
  value: {
-  dps: 269145.55335
-  tps: 257511.43449
+  dps: 263840.85371
+  tps: 252608.78667
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BurningPrimalDiamond"
  value: {
-  dps: 244327.22497
-  tps: 235583.41069
+  dps: 241732.72462
+  tps: 233112.34502
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-CapacitivePrimalDiamond"
  value: {
-  dps: 240425.47962
-  tps: 231829.31026
+  dps: 237979.78428
+  tps: 229508.92472
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ChronomancerRegalia"
  value: {
-  dps: 200376.69799
-  tps: 193145.38278
+  dps: 198384.80826
+  tps: 191255.8481
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-CourageousPrimalDiamond"
  value: {
-  dps: 241985.33031
-  tps: 233343.68218
+  dps: 239445.98598
+  tps: 230927.31611
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DelicateVialoftheSanguinaire-96895"
  value: {
-  dps: 229137.66185
-  tps: 220816.49618
+  dps: 227578.24244
+  tps: 219282.17487
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DestructivePrimalDiamond"
  value: {
-  dps: 240680.91323
-  tps: 232083.39074
+  dps: 238298.62382
+  tps: 229808.80759
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EffulgentPrimalDiamond"
  value: {
-  dps: 239540.23339
-  tps: 230960.78748
+  dps: 236953.6178
+  tps: 228519.14354
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EmberPrimalDiamond"
  value: {
-  dps: 241168.18895
-  tps: 232549.07889
+  dps: 238635.56353
+  tps: 230138.40044
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-BloodyDancingSteel-5125"
  value: {
-  dps: 251141.59393
-  tps: 241683.22589
+  dps: 249004.43002
+  tps: 239630.728
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-Colossus-4445"
  value: {
-  dps: 251141.59393
-  tps: 241683.22589
+  dps: 248885.81642
+  tps: 239519.53067
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-DancingSteel-4444"
  value: {
-  dps: 251141.59393
-  tps: 241683.22589
+  dps: 249004.43002
+  tps: 239630.728
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-ElementalForce-4443"
  value: {
-  dps: 253561.30793
-  tps: 244096.15261
+  dps: 251102.79235
+  tps: 241692.31988
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-River'sSong-4446"
  value: {
-  dps: 251101.14628
-  tps: 241642.77824
+  dps: 249004.43002
+  tps: 239630.728
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-SpiritofConquest-5124"
  value: {
-  dps: 258567.19857
-  tps: 247880.61893
+  dps: 256292.49278
+  tps: 245639.2151
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-Windsong-4441"
  value: {
-  dps: 254371.22895
-  tps: 243739.80821
+  dps: 254751.58177
+  tps: 244202.52373
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnigmaticPrimalDiamond"
  value: {
-  dps: 240680.91323
-  tps: 232083.39074
+  dps: 238298.62382
+  tps: 229808.80759
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EternalPrimalDiamond"
  value: {
-  dps: 239540.23339
-  tps: 230960.78748
+  dps: 236953.6178
+  tps: 228519.14354
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EvilEyeofGalakras-105491"
  value: {
-  dps: 229120.85129
-  tps: 220799.68562
+  dps: 227578.24244
+  tps: 219282.17487
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-FabledFeatherofJi-Kun-96842"
  value: {
-  dps: 229110.77741
-  tps: 220789.61174
+  dps: 227109.72919
+  tps: 218816.68243
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Fen-Yu,FuryofXuen-102248"
  value: {
-  dps: 254184.53322
-  tps: 243810.67903
+  dps: 251384.58795
+  tps: 241068.46469
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-FleetPrimalDiamond"
  value: {
-  dps: 241370.53838
-  tps: 232743.46344
+  dps: 238765.4562
+  tps: 230283.98942
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ForlornPrimalDiamond"
  value: {
-  dps: 241168.18895
-  tps: 232549.07889
+  dps: 238635.56353
+  tps: 230138.40044
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-FrenziedCrystalofRage-105572"
  value: {
-  dps: 256510.29353
-  tps: 245873.8619
+  dps: 254639.25571
+  tps: 244006.8214
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Fusion-FireCore-105459"
  value: {
-  dps: 229124.36711
-  tps: 220803.20144
+  dps: 227578.24244
+  tps: 219282.17487
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-GazeoftheTwins-96915"
  value: {
-  dps: 233874.26776
-  tps: 225310.42299
+  dps: 232283.36762
+  tps: 223742.02245
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Gladiator'sRegalia"
  value: {
-  dps: 218917.16894
-  tps: 210665.51044
+  dps: 217422.14212
+  tps: 209252.64235
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Gong-Lu,StrengthofXuen-102249"
  value: {
-  dps: 254184.53322
-  tps: 243810.67903
+  dps: 251384.58795
+  tps: 241068.46469
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Haromm'sTalisman-105527"
  value: {
-  dps: 241590.32875
-  tps: 233267.45705
+  dps: 240000.17686
+  tps: 231702.14001
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Horridon'sLastGasp-96757"
  value: {
-  dps: 241891.1337
-  tps: 233214.03913
+  dps: 240288.32106
+  tps: 231655.36556
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ImpassivePrimalDiamond"
  value: {
-  dps: 240680.91323
-  tps: 232083.39074
+  dps: 238298.62382
+  tps: 229808.80759
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-IndomitablePrimalDiamond"
  value: {
-  dps: 239540.23339
-  tps: 230960.78748
+  dps: 236953.6178
+  tps: 228519.14354
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-InscribedBagofHydra-Spawn-96828"
  value: {
-  dps: 229137.66185
-  tps: 220816.49618
+  dps: 227578.24244
+  tps: 219282.17487
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Ji-Kun'sRisingWinds-96843"
  value: {
-  dps: 229137.66185
-  tps: 220816.49618
+  dps: 227578.24244
+  tps: 219282.17487
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Kardris'ToxicTotem-105540"
  value: {
-  dps: 268986.34794
-  tps: 258187.08776
+  dps: 267036.30199
+  tps: 256259.44949
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-NitroBoosts-4223"
  value: {
-  dps: 258517.52922
-  tps: 247849.22881
+  dps: 255779.76984
+  tps: 245164.97564
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PhaseFingers-4697"
  value: {
-  dps: 257700.63355
-  tps: 247055.09757
+  dps: 255013.59337
+  tps: 244422.56893
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PowerfulPrimalDiamond"
  value: {
-  dps: 239540.23339
-  tps: 230960.78748
+  dps: 236953.6178
+  tps: 228519.14354
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PriceofProgress-81266"
  value: {
-  dps: 235264.43362
-  tps: 226777.63528
+  dps: 233798.71199
+  tps: 225340.41376
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Primordius'TalismanofRage-96873"
  value: {
-  dps: 234489.4849
-  tps: 225971.30377
+  dps: 233112.2793
+  tps: 224615.77035
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PurifiedBindingsofImmerseus-105422"
  value: {
-  dps: 269216.16226
-  tps: 258431.0084
+  dps: 268480.03682
+  tps: 257614.91217
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Qian-Le,CourageofNiuzao-102245"
  value: {
-  dps: 251894.6491
-  tps: 241631.61532
+  dps: 249712.68749
+  tps: 239428.74176
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Qian-Ying,FortitudeofNiuzao-102250"
  value: {
-  dps: 248996.52624
-  tps: 238819.74236
+  dps: 246640.61908
+  tps: 236443.06142
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RegaliaoftheBurningScroll"
  value: {
-  dps: 202723.15097
-  tps: 195035.98881
+  dps: 200931.07544
+  tps: 193319.62541
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RegaliaoftheChromaticHydra"
  value: {
-  dps: 212968.75384
-  tps: 205068.66375
+  dps: 210476.08628
+  tps: 202697.87571
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Renataki'sSoulCharm-96741"
  value: {
-  dps: 229095.00404
-  tps: 220773.83838
+  dps: 227568.48482
+  tps: 219272.41724
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ReverberatingPrimalDiamond"
  value: {
-  dps: 242669.23358
-  tps: 233965.66327
+  dps: 240017.65139
+  tps: 231461.75952
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RevitalizingPrimalDiamond"
  value: {
-  dps: 242669.23358
-  tps: 233965.66327
+  dps: 240017.65139
+  tps: 231461.75952
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RuneofRe-Origination-96918"
  value: {
-  dps: 229427.24129
-  tps: 221088.91641
+  dps: 227493.26228
+  tps: 219191.33053
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SigilofRampage-105580"
  value: {
-  dps: 229137.66185
-  tps: 220816.49618
+  dps: 227578.24244
+  tps: 219282.17487
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SinisterPrimalDiamond"
  value: {
-  dps: 258517.52922
-  tps: 247849.22881
+  dps: 255779.76984
+  tps: 245164.97564
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Skeer'sBloodsoakedTalisman-105632"
  value: {
-  dps: 229137.66185
-  tps: 220816.49618
+  dps: 227578.24244
+  tps: 219282.17487
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SoothingTalismanoftheShado-PanAssault-94509"
  value: {
-  dps: 239990.83305
-  tps: 231431.34193
+  dps: 239160.61492
+  tps: 230649.53896
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SoulBarrier-96927"
  value: {
-  dps: 229137.66185
-  tps: 220816.49618
+  dps: 227578.24244
+  tps: 219282.17487
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SparkofZandalar-96770"
  value: {
-  dps: 231852.26732
-  tps: 223635.57995
+  dps: 229663.902
+  tps: 221555.09306
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SynapseSprings(MarkII)-4898"
  value: {
-  dps: 261446.02665
-  tps: 250437.86032
+  dps: 260089.09473
+  tps: 249105.79122
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TalismanofBloodlust-96864"
  value: {
-  dps: 234643.5655
-  tps: 226173.45047
+  dps: 233455.99183
+  tps: 224986.56269
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TheGloamingBlade-88149"
  value: {
-  dps: 258517.52922
-  tps: 247849.22881
+  dps: 255779.76984
+  tps: 245164.97564
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Thok'sTailTip-105609"
  value: {
-  dps: 239224.03976
-  tps: 230685.90615
+  dps: 239197.44128
+  tps: 230605.36389
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TickingEbonDetonator-105612"
  value: {
-  dps: 237003.89323
-  tps: 228453.39791
+  dps: 235294.94626
+  tps: 226769.61861
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Time-LostArtifact-103678"
  value: {
-  dps: 233788.60539
-  tps: 225347.59259
+  dps: 232196.34561
+  tps: 223779.44458
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TyrannicalPrimalDiamond"
  value: {
-  dps: 239540.23339
-  tps: 230960.78748
+  dps: 236953.6178
+  tps: 228519.14354
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-UnerringVisionofLeiShen-96930"
  value: {
-  dps: 259604.21316
-  tps: 248813.46581
+  dps: 257323.00067
+  tps: 246564.03193
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Wushoolay'sFinalChoice-96785"
  value: {
-  dps: 254893.04214
-  tps: 244596.47807
+  dps: 251785.76227
+  tps: 241527.78535
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Xing-Ho,BreathofYu'lon-102246"
  value: {
-  dps: 305508.85149
-  tps: 294721.96204
+  dps: 302149.41509
+  tps: 291420.93711
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ZenAlchemistStone-75274"
  value: {
-  dps: 242491.41222
-  tps: 233359.60623
+  dps: 241429.69823
+  tps: 232295.2798
  }
 }
 dps_results: {
  key: "TestArcane-Average-Default"
  value: {
-  dps: 264247.3653
-  tps: 253195.49715
+  dps: 263223.94037
+  tps: 252140.10048
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 675178.86505
-  tps: 667688.18852
+  dps: 672394.5654
+  tps: 665161.73598
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 253484.94022
-  tps: 243184.21802
+  dps: 252256.90067
+  tps: 241955.73596
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 439377.041
-  tps: 393048.21377
+  dps: 430983.08133
+  tps: 384640.83561
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 479132.53779
-  tps: 481475.34819
+  dps: 474673.54135
+  tps: 477071.47149
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 176061.67818
-  tps: 174192.69339
+  dps: 175334.02468
+  tps: 173473.22519
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 239537.16126
-  tps: 234221.4402
+  dps: 235803.68355
+  tps: 230592.4513
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 524708.47086
-  tps: 498630.70622
+  dps: 517458.37062
+  tps: 493545.27006
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 245092.03348
-  tps: 234260.8369
+  dps: 242897.68344
+  tps: 232260.76214
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 429696.64996
-  tps: 380698.22581
+  dps: 416954.05457
+  tps: 368873.90771
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 345042.51782
-  tps: 346151.03314
+  dps: 340548.68933
+  tps: 341714.91735
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 169390.56906
-  tps: 167518.9182
+  dps: 168760.99176
+  tps: 166918.46786
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 231446.83775
-  tps: 226286.26741
+  dps: 228156.15364
+  tps: 223140.92972
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 840590.31781
-  tps: 828668.60077
+  dps: 840413.03266
+  tps: 828692.17234
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 252687.29394
-  tps: 241798.30374
+  dps: 250575.07435
+  tps: 239889.51782
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 438545.82409
-  tps: 389130.07597
+  dps: 429478.96483
+  tps: 381026.77646
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 599815.58772
-  tps: 600450.41465
+  dps: 593253.19973
+  tps: 593941.74775
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 173523.32523
-  tps: 171539.6462
+  dps: 172068.55227
+  tps: 170133.02799
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 237213.00076
-  tps: 231604.45442
+  dps: 231716.82183
+  tps: 226325.27284
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 481611.68198
-  tps: 484667.90871
+  dps: 472899.61911
+  tps: 476681.27545
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 111182.54874
-  tps: 103750.33247
+  dps: 108808.47222
+  tps: 101579.26322
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 378391.28594
-  tps: 340141.33192
+  dps: 366522.82186
+  tps: 329284.05133
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 338282.80245
-  tps: 349302.89718
+  dps: 336893.70958
+  tps: 347934.41777
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 69053.01777
-  tps: 68488.1005
+  dps: 67109.5335
+  tps: 66605.46766
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 208749.58442
-  tps: 204792.23695
+  dps: 198960.25973
+  tps: 195358.75052
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 572175.77506
-  tps: 576145.9873
+  dps: 566301.12421
+  tps: 570271.9975
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 200628.78005
-  tps: 193660.203
+  dps: 197739.35629
+  tps: 190957.47515
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 361850.29648
-  tps: 327970.64957
+  dps: 348499.51049
+  tps: 315525.81739
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 414738.68784
-  tps: 424730.66145
+  dps: 413483.95706
+  tps: 423468.41161
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 139326.8264
-  tps: 138392.60739
+  dps: 138698.84514
+  tps: 137773.51667
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 186769.0455
-  tps: 182257.01815
+  dps: 183623.51601
+  tps: 179153.49913
  }
 }
 dps_results: {
@@ -943,211 +943,211 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 694059.31808
-  tps: 686245.11961
+  dps: 684588.77663
+  tps: 676728.11945
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 262232.15151
-  tps: 251199.33085
+  dps: 260871.63511
+  tps: 249863.59263
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 464273.31574
-  tps: 414145.65751
+  dps: 456333.26645
+  tps: 406351.65727
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 489144.03675
-  tps: 491958.82444
+  dps: 485892.14915
+  tps: 488853.8249
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 181077.1001
-  tps: 179107.6037
+  dps: 180128.58588
+  tps: 178191.92179
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 250470.09508
-  tps: 244796.75564
+  dps: 244739.44569
+  tps: 239230.58599
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 533989.62135
-  tps: 506256.77436
+  dps: 527229.67893
+  tps: 502461.01035
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 248578.30409
-  tps: 237307.87537
+  dps: 245676.06228
+  tps: 234435.45449
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 443435.35433
-  tps: 392226.02459
+  dps: 438272.18129
+  tps: 387227.5542
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 355137.20204
-  tps: 356160.37509
+  dps: 350174.0112
+  tps: 351277.61487
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 172140.79184
-  tps: 170242.29463
+  dps: 171282.68026
+  tps: 169416.20392
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 234339.09395
-  tps: 228885.46311
+  dps: 230577.18039
+  tps: 225284.21931
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 862880.61149
-  tps: 850169.34929
+  dps: 858225.06259
+  tps: 845622.99592
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 255808.75645
-  tps: 244257.09717
+  dps: 252896.42247
+  tps: 241462.99072
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 449595.99897
-  tps: 397444.07478
+  dps: 438053.45857
+  tps: 386547.2415
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 603072.70695
-  tps: 604475.08558
+  dps: 606561.39277
+  tps: 607846.9444
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 177588.82968
-  tps: 175500.00483
+  dps: 175485.1916
+  tps: 173454.29421
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 240207.54569
-  tps: 234318.71049
+  dps: 236379.5182
+  tps: 230692.56733
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 491774.69422
-  tps: 494785.35885
+  dps: 482248.96802
+  tps: 485866.64182
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 113119.41617
-  tps: 105721.38287
+  dps: 110398.88008
+  tps: 103186.58031
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 389740.26709
-  tps: 351950.18814
+  dps: 376144.40752
+  tps: 339275.45219
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 341910.2437
-  tps: 353515.21012
+  dps: 340699.62037
+  tps: 352339.93655
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 69680.28691
-  tps: 69080.59584
+  dps: 67477.92643
+  tps: 66941.15884
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 212034.2313
-  tps: 207892.13442
+  dps: 201029.33238
+  tps: 197205.76874
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 588139.26418
-  tps: 592445.32059
+  dps: 583689.17507
+  tps: 587995.50764
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 203065.98981
-  tps: 196597.71068
+  dps: 199565.53383
+  tps: 193286.20017
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 363586.68848
-  tps: 332683.23602
+  dps: 348736.97567
+  tps: 318819.90985
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 417435.36195
-  tps: 428906.66956
+  dps: 415968.75495
+  tps: 427444.82226
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 140307.27077
-  tps: 139407.60876
+  dps: 139551.05598
+  tps: 138660.01253
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 193001.30702
-  tps: 188469.12563
+  dps: 189534.12395
+  tps: 185043.70321
  }
 }
 dps_results: {
@@ -1363,7 +1363,7 @@ dps_results: {
 dps_results: {
  key: "TestArcane-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 262232.15151
-  tps: 251199.33085
+  dps: 260871.63511
+  tps: 249863.59263
  }
 }
diff --git a/sim/mage/fire/TestFire.results b/sim/mage/fire/TestFire.results
index 542cc4b33e..9f463f568d 100644
--- a/sim/mage/fire/TestFire.results
+++ b/sim/mage/fire/TestFire.results
@@ -89,8 +89,8 @@ dps_results: {
 dps_results: {
  key: "TestFire-AllItems-BlackBloodofY'Shaarj-105648"
  value: {
-  dps: 168331.6727
-  tps: 163805.79586
+  dps: 167197.44883
+  tps: 162730.59082
  }
 }
 dps_results: {
@@ -2392,8 +2392,8 @@ dps_results: {
 dps_results: {
  key: "TestFire-AllItems-Wushoolay'sFinalChoice-96785"
  value: {
-  dps: 151200.99334
-  tps: 147159.65728
+  dps: 149762.49072
+  tps: 145741.62368
  }
 }
 dps_results: {
diff --git a/sim/mage/frost/TestFrost.results b/sim/mage/frost/TestFrost.results
index 103dea5371..b4ec579129 100644
--- a/sim/mage/frost/TestFrost.results
+++ b/sim/mage/frost/TestFrost.results
@@ -54,8 +54,8 @@ dps_results: {
 dps_results: {
  key: "TestFrost-AllItems-BlackBloodofY'Shaarj-105648"
  value: {
-  dps: 175922.50483
-  tps: 128279.16303
+  dps: 176451.38176
+  tps: 128653.32481
  }
 }
 dps_results: {
@@ -495,8 +495,8 @@ dps_results: {
 dps_results: {
  key: "TestFrost-AllItems-Wushoolay'sFinalChoice-96785"
  value: {
-  dps: 162929.76163
-  tps: 119026.63359
+  dps: 162234.99754
+  tps: 118586.24646
  }
 }
 dps_results: {
diff --git a/sim/monk/brewmaster/TestBrewmaster.results b/sim/monk/brewmaster/TestBrewmaster.results
index 2a9ca6994a..341225b2d4 100644
--- a/sim/monk/brewmaster/TestBrewmaster.results
+++ b/sim/monk/brewmaster/TestBrewmaster.results
@@ -2715,10 +2715,10 @@ dps_results: {
 dps_results: {
  key: "TestBrewmaster-AllItems-TickingEbonDetonator-105612"
  value: {
-  dps: 280443.12765
-  tps: 1.2080022053e+06
+  dps: 280460.43133
+  tps: 1.20812333106e+06
   dtps: 13651.61794
-  hps: 31015.91987
+  hps: 31018.86531
  }
 }
 dps_results: {
diff --git a/sim/monk/windwalker/TestWindwalker.results b/sim/monk/windwalker/TestWindwalker.results
index f24eaf3e91..17e23f9c43 100644
--- a/sim/monk/windwalker/TestWindwalker.results
+++ b/sim/monk/windwalker/TestWindwalker.results
@@ -2433,9 +2433,9 @@ dps_results: {
 dps_results: {
  key: "TestWindwalker-AllItems-TickingEbonDetonator-105612"
  value: {
-  dps: 271886.08025
-  tps: 259546.47389
-  hps: 8823.0909
+  dps: 271907.0088
+  tps: 259566.55912
+  hps: 8825.87634
  }
 }
 dps_results: {
diff --git a/sim/paladin/retribution/TestRetribution.results b/sim/paladin/retribution/TestRetribution.results
index fd8999cfc6..4a65c092ec 100644
--- a/sim/paladin/retribution/TestRetribution.results
+++ b/sim/paladin/retribution/TestRetribution.results
@@ -2393,8 +2393,8 @@ dps_results: {
 dps_results: {
  key: "TestRetribution-AllItems-TickingEbonDetonator-105612"
  value: {
-  dps: 240898.69088
-  tps: 229849.35766
+  dps: 240900.50608
+  tps: 229851.17286
   hps: 22.01849
  }
 }