diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results
index 7a0cfd12d3..f6a326401a 100644
--- a/sim/mage/TestArcane.results
+++ b/sim/mage/TestArcane.results
@@ -298,18 +298,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -0.20439
+  weights: -0.88337
   weights: 0
-  weights: 1.22546
-  weights: 1.09824
-  weights: 0.12722
+  weights: 1.21892
+  weights: 1.09189
+  weights: 0.12703
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 13.72806
+  weights: 14.07399
   weights: 0
   weights: 0
   weights: 0
@@ -589,29 +589,29 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 684.20857
-  tps: 690.8746
+  dps: 684.08679
+  tps: 692.8031
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 629.34438
-  tps: 635.48304
+  dps: 629.22425
+  tps: 637.11462
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 679.84549
-  tps: 686.46887
+  dps: 679.72372
+  tps: 688.41069
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 628.95516
-  tps: 634.85904
+  dps: 628.68867
+  tps: 637.05315
  }
 }
 dps_results: {
@@ -624,22 +624,22 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 684.20857
-  tps: 690.8746
+  dps: 684.08679
+  tps: 692.8031
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 629.34438
-  tps: 635.48304
+  dps: 629.22425
+  tps: 637.11462
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 1634.62893
-  tps: 1655.93236
+  dps: 1630.73808
+  tps: 1652.48143
  }
 }
 dps_results: {
@@ -652,99 +652,99 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 2069.08713
-  tps: 2091.87855
+  dps: 2054.82151
+  tps: 2078.14061
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2088.13209
-  tps: 2468.77138
+  dps: 2081.4061
+  tps: 2491.653
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2088.13209
-  tps: 2107.16406
+  dps: 2081.4061
+  tps: 2101.91845
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2341.43891
-  tps: 2358.31393
+  dps: 2341.45102
+  tps: 2359.2382
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 1006.5327
-  tps: 1247.45353
+  dps: 980.09414
+  tps: 1226.73852
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 1006.5327
-  tps: 1018.57875
+  dps: 980.09414
+  tps: 992.42635
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Gnome-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1250.69607
-  tps: 1264.46516
+  dps: 1250.73439
+  tps: 1266.68376
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 2092.00401
-  tps: 2476.69454
+  dps: 2090.03172
+  tps: 2501.22251
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 2092.00401
-  tps: 2111.23854
+  dps: 2090.03172
+  tps: 2110.59126
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 2371.01326
-  tps: 2389.97336
+  dps: 2371.02537
+  tps: 2390.29165
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 995.81967
-  tps: 1238.67995
+  dps: 968.95013
+  tps: 1216.33511
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 995.81967
-  tps: 1007.96268
+  dps: 968.95013
+  tps: 981.31938
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-Settings-Troll-p4_arcane-Arcane-p4_arcane-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1264.6048
-  tps: 1280.55417
+  dps: 1264.62377
+  tps: 1281.48918
  }
 }
 dps_results: {
  key: "TestArcane-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 2078.79733
-  tps: 2101.5431
+  dps: 2054.53651
+  tps: 2077.89264
  }
 }
 dps_results: {
diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results
index ab38f947d8..70d9328ca8 100644
--- a/sim/mage/TestFire.results
+++ b/sim/mage/TestFire.results
@@ -396,18 +396,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 2.55614
+  weights: 3.40147
   weights: 0
-  weights: 2.06133
+  weights: 1.98432
   weights: 0
-  weights: 2.06133
+  weights: 1.98432
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 28.37501
+  weights: 21.26948
   weights: 0
   weights: 0
   weights: 0
@@ -445,18 +445,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 1.3624
+  weights: 0.64024
   weights: 0
-  weights: 2.41782
+  weights: 2.39253
   weights: 0
-  weights: 2.41782
+  weights: 2.39253
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 31.43369
+  weights: 33.06184
   weights: 0
   weights: 0
   weights: 0
@@ -785,29 +785,29 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 2052.8836
-  tps: 1343.87287
+  dps: 1978.13588
+  tps: 1295.26232
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 1865.47138
-  tps: 1226.73077
+  dps: 1840.53503
+  tps: 1209.90291
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 2027.04391
-  tps: 1327.91674
+  dps: 1930.02845
+  tps: 1266.50107
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 1854.99813
-  tps: 1215.65549
+  dps: 1768.03779
+  tps: 1158.05177
  }
 }
 dps_results: {
@@ -820,22 +820,22 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 2052.8836
-  tps: 1343.87287
+  dps: 1978.13588
+  tps: 1295.26232
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 1865.47138
-  tps: 1226.73077
+  dps: 1840.53503
+  tps: 1209.90291
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-AllItems-MalevolentProphet'sVestments"
  value: {
-  dps: 2214.79775
-  tps: 1453.99198
+  dps: 2170.06198
+  tps: 1425.62099
  }
 }
 dps_results: {
@@ -848,22 +848,22 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3102.63722
-  tps: 2039.63008
+  dps: 3001.35682
+  tps: 1972.31589
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3171.08389
-  tps: 2643.77325
+  dps: 3047.60889
+  tps: 2549.63272
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3171.08389
-  tps: 2080.47927
+  dps: 3047.60889
+  tps: 1998.57808
  }
 }
 dps_results: {
@@ -876,15 +876,15 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 877.65663
-  tps: 919.30497
+  dps: 834.74694
+  tps: 884.25808
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Gnome-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 877.65663
-  tps: 573.87449
+  dps: 834.74694
+  tps: 543.80302
  }
 }
 dps_results: {
@@ -897,15 +897,15 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3145.66314
-  tps: 2627.24677
+  dps: 3011.23011
+  tps: 2525.06781
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3145.66314
-  tps: 2068.73883
+  dps: 3011.23011
+  tps: 1980.07046
  }
 }
 dps_results: {
@@ -918,15 +918,15 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 822.94629
-  tps: 876.09527
+  dps: 763.26259
+  tps: 830.3161
  }
 }
 dps_results: {
  key: "TestFire-Phase4-Lvl60-Settings-Troll-p4_fire-Fire-p4_fire-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 822.94629
-  tps: 536.43548
+  dps: 763.26259
+  tps: 495.25131
  }
 }
 dps_results: {
@@ -939,36 +939,36 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3158.31838
-  tps: 2077.66059
+  dps: 3022.39287
+  tps: 1987.29295
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 2318.19604
-  tps: 1525.05723
+  dps: 2295.68875
+  tps: 1509.21895
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 2085.66316
-  tps: 1373.02513
+  dps: 2085.42728
+  tps: 1372.47773
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 2294.67861
-  tps: 1510.41697
+  dps: 2264.64873
+  tps: 1489.62535
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 2082.00722
-  tps: 1369.81781
+  dps: 2060.57681
+  tps: 1354.97988
  }
 }
 dps_results: {
@@ -981,15 +981,15 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 2318.19604
-  tps: 1525.05723
+  dps: 2295.68875
+  tps: 1509.21895
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 2085.66316
-  tps: 1373.02513
+  dps: 2085.42728
+  tps: 1372.47773
  }
 }
 dps_results: {
@@ -1009,22 +1009,22 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Average-Default"
  value: {
-  dps: 3745.69287
-  tps: 2159.18464
+  dps: 3703.34736
+  tps: 2134.47055
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 16442.20747
-  tps: 9734.60024
+  dps: 16389.24084
+  tps: 9703.17079
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 3717.28333
-  tps: 2146.68227
+  dps: 3702.12666
+  tps: 2138.63682
  }
 }
 dps_results: {
@@ -1037,15 +1037,15 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 5170.85241
-  tps: 3170.44887
+  dps: 5163.17202
+  tps: 3165.74673
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Gnome-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1044.54842
-  tps: 616.99944
+  dps: 1012.24735
+  tps: 597.54798
  }
 }
 dps_results: {
@@ -1058,15 +1058,15 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 15846.03607
-  tps: 9385.2093
+  dps: 15853.19775
+  tps: 9391.6087
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-FullBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 3689.08823
-  tps: 2133.40899
+  dps: 3672.47039
+  tps: 2122.22097
  }
 }
 dps_results: {
@@ -1079,15 +1079,15 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongMultiTarget"
  value: {
-  dps: 5239.54571
-  tps: 3200.12025
+  dps: 5220.12261
+  tps: 3188.56792
  }
 }
 dps_results: {
  key: "TestFire-Phase5-Lvl60-Settings-Troll-p5_fire-Fire-p5_fire-NoBuffs-P5-Consumes-LongSingleTarget"
  value: {
-  dps: 1018.65681
-  tps: 600.66592
+  dps: 992.95873
+  tps: 584.45098
  }
 }
 dps_results: {
@@ -1100,7 +1100,7 @@ dps_results: {
 dps_results: {
  key: "TestFire-Phase5-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3768.4147
-  tps: 2173.96669
+  dps: 3750.62217
+  tps: 2163.14984
  }
 }
diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results
index c61ebd0bd0..3c865ff9b5 100644
--- a/sim/mage/TestFrost.results
+++ b/sim/mage/TestFrost.results
@@ -200,18 +200,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: -1.08136
+  weights: 1.7351
   weights: 0
-  weights: 2.38746
+  weights: 2.08131
   weights: 0
-  weights: 2.18655
-  weights: 0.20091
+  weights: 1.85582
+  weights: 0.22549
   weights: 0
   weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 41.84952
+  weights: 26.33318
   weights: 0
   weights: 0
   weights: 0
@@ -393,29 +393,29 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-BloodGuard'sDreadweave"
  value: {
-  dps: 2465.13878
-  tps: 1992.26127
+  dps: 1735.03537
+  tps: 1426.5872
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-BloodGuard'sSatin"
  value: {
-  dps: 2287.48098
-  tps: 1845.60329
+  dps: 1569.19276
+  tps: 1289.56962
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-EmeraldEnchantedVestments"
  value: {
-  dps: 2455.10498
-  tps: 1985.21347
+  dps: 1724.7375
+  tps: 1417.97999
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-EmeraldWovenGarb"
  value: {
-  dps: 2257.69071
-  tps: 1821.26508
+  dps: 1563.2498
+  tps: 1284.01585
  }
 }
 dps_results: {
@@ -428,15 +428,15 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-Knight-Lieutenant'sDreadweave"
  value: {
-  dps: 2465.13878
-  tps: 1992.26127
+  dps: 1735.03537
+  tps: 1426.5872
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-AllItems-KnightLieutenant'sSatin"
  value: {
-  dps: 2287.48098
-  tps: 1845.60329
+  dps: 1569.19276
+  tps: 1289.56962
  }
 }
 dps_results: {
@@ -456,99 +456,99 @@ dps_results: {
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Average-Default"
  value: {
-  dps: 3442.95405
-  tps: 2794.08843
+  dps: 2904.19938
+  tps: 2385.16958
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3530.58575
-  tps: 3368.7
+  dps: 2905.00949
+  tps: 2889.65672
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3530.58575
-  tps: 2866.16264
+  dps: 2905.00949
+  tps: 2385.63608
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3582.9833
-  tps: 2907.06742
+  dps: 3118.04811
+  tps: 2551.77417
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 995.5606
-  tps: 1124.01793
+  dps: 929.23103
+  tps: 1083.44585
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 995.5606
-  tps: 805.41863
+  dps: 929.23103
+  tps: 759.24614
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Gnome-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1718.51793
-  tps: 1376.79551
+  dps: 1530.72229
+  tps: 1243.34223
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 3400.40562
-  tps: 3253.02393
+  dps: 2886.22441
+  tps: 2870.17793
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 3400.40562
-  tps: 2759.11328
+  dps: 2886.22441
+  tps: 2371.23334
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-FullBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 3649.15751
-  tps: 2958.32099
+  dps: 3177.14381
+  tps: 2598.68714
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongMultiTarget"
  value: {
-  dps: 963.51627
-  tps: 1095.51626
+  dps: 918.08217
+  tps: 1073.77909
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-LongSingleTarget"
  value: {
-  dps: 963.51627
-  tps: 777.76249
+  dps: 918.08217
+  tps: 749.84157
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-Settings-Troll-p4_frost-Frost-p4_frost-NoBuffs-P4-Consumes-ShortSingleTarget"
  value: {
-  dps: 1732.26429
-  tps: 1382.99594
+  dps: 1584.81355
+  tps: 1283.55869
  }
 }
 dps_results: {
  key: "TestFrost-Phase4-Lvl60-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 3415.55891
-  tps: 2769.99502
+  dps: 2886.63881
+  tps: 2370.72716
  }
 }
 dps_results: {
diff --git a/sim/mage/balefire_bolt.go b/sim/mage/balefire_bolt.go
index 4911eb0945..3b8c73d25e 100644
--- a/sim/mage/balefire_bolt.go
+++ b/sim/mage/balefire_bolt.go
@@ -20,20 +20,22 @@ func (mage *Mage) registerBalefireBoltSpell() {
 	castTime := time.Millisecond * 2500
 	buffDuration := time.Second * 30
 	manaCost := .20
+	maxStacks := 5
+	stackMultiplier := 0.20
 
-	statDeps := make([]*stats.StatDependency, 11) // 10 stacks + zero conditions
-	for i := 1; i < 11; i++ {
-		statDeps[i] = mage.NewDynamicMultiplyStat(stats.Spirit, 1.0-.1*float64(i))
+	statDeps := make([]*stats.StatDependency, maxStacks+1) // 5 stacks + zero conditions
+	for i := 1; i < maxStacks+1; i++ {
+		statDeps[i] = mage.NewDynamicMultiplyStat(stats.Spirit, 1.0-stackMultiplier*float64(i))
 	}
 
 	balefireAura := mage.RegisterAura(core.Aura{
 		Label:     "Balefire Bolt (Stacks)",
 		ActionID:  core.ActionID{SpellID: int32(proto.MageRune_RuneBracersBalefireBolt)}.WithTag(1),
 		Duration:  buffDuration,
-		MaxStacks: 5,
+		MaxStacks: int32(maxStacks),
 		OnStacksChange: func(aura *core.Aura, sim *core.Simulation, oldStacks int32, newStacks int32) {
-			mage.BalefireBolt.DamageMultiplierAdditive -= .2 * float64(oldStacks)
-			mage.BalefireBolt.DamageMultiplierAdditive += .2 * float64(newStacks)
+			mage.BalefireBolt.DamageMultiplierAdditive -= stackMultiplier * float64(oldStacks)
+			mage.BalefireBolt.DamageMultiplierAdditive += stackMultiplier * float64(newStacks)
 
 			if oldStacks != 0 {
 				aura.Unit.DisableDynamicStatDep(sim, statDeps[oldStacks])
@@ -42,7 +44,7 @@ func (mage *Mage) registerBalefireBoltSpell() {
 				aura.Unit.EnableDynamicStatDep(sim, statDeps[newStacks])
 			}
 
-			if newStacks == 10 {
+			if newStacks == aura.MaxStacks {
 				mage.RemoveHealth(sim, mage.CurrentHealth())
 
 				if sim.Log != nil {
diff --git a/ui/mage/apls/p4_frost.apl.json b/ui/mage/apls/p4_frost.apl.json
index 7d3a0325f5..90e0ed6524 100644
--- a/ui/mage/apls/p4_frost.apl.json
+++ b/ui/mage/apls/p4_frost.apl.json
@@ -7,9 +7,9 @@
   "priorityList": [
     {"action":{"condition":{"cmp":{"op":"OpLe","lhs":{"currentManaPercent":{}},"rhs":{"const":{"val":"15%"}}}},"castSpell":{"spellId":{"spellId":12051}}}},
     {"action":{"castSpell":{"spellId":{"spellId":440802}}}},
-    {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":456398,"tag":2}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"9"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":456398,"tag":2}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":2139}}}},
+    {"action":{"condition":{"and":{"vals":[{"auraIsKnown":{"auraId":{"spellId":456398,"tag":2}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"auraId":{"spellId":456398,"tag":2}}},"rhs":{"const":{"val":"1.5s"}}}}]}},"castSpell":{"spellId":{"spellId":2139}}}},
     {"action":{"condition":{"runeIsEquipped":{"runeId":{"spellId":400615}}},"castSpell":{"spellId":{"spellId":10199,"rank":7}}}},
-    {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"9"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":428878}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}},
+    {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}},{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":428878}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}},
     {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":401502}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}},
     {"action":{"condition":{"and":{"vals":[{"runeIsEquipped":{"runeId":{"spellId":400647}}},{"cmp":{"op":"OpEq","lhs":{"auraNumStacks":{"auraId":{"spellId":400647}}},"rhs":{"const":{"val":"1"}}}}]}},"strictSequence":{"actions":[{"castSpell":{"spellId":{"spellId":25304,"rank":11}}},{"castSpell":{"spellId":{"spellId":428739}}}]}}},
     {"action":{"condition":{"or":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"5"}}}},{"cmp":{"op":"OpLe","lhs":{"auraRemainingTime":{"sourceUnit":{"type":"CurrentTarget"},"auraId":{"spellId":12873,"rank":3}}},"rhs":{"const":{"val":"6s"}}}}]}},"castSpell":{"spellId":{"spellId":10207,"rank":7}}}},
@@ -17,7 +17,7 @@
     {"action":{"castSpell":{"spellId":{"spellId":401556}}}},
     {"action":{"autocastOtherCooldowns":{}}},
     {"action":{"condition":{"and":{"vals":[{"not":{"val":{"spellIsReady":{"spellId":{"spellId":425121}}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":428739}}}}}]}},"castSpell":{"spellId":{"spellId":12472}}}},
-    {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"9"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":428739}}}}}]}},"castSpell":{"spellId":{"spellId":428878}}}},
+    {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"auraNumStacks":{"auraId":{"spellId":428878,"tag":1}}},"rhs":{"const":{"val":"4"}}}},{"not":{"val":{"spellIsReady":{"spellId":{"spellId":428739}}}}}]}},"castSpell":{"spellId":{"spellId":428878}}}},
     {"action":{"castSpell":{"spellId":{"spellId":401502}}}},
     {"action":{"castSpell":{"spellId":{"spellId":10181,"rank":10}}}}
   ]