diff --git a/sim/deathknight/dps/TestBlood.results b/sim/deathknight/dps/TestBlood.results
index 06f7edadbe..2421f40581 100644
--- a/sim/deathknight/dps/TestBlood.results
+++ b/sim/deathknight/dps/TestBlood.results
@@ -1,35 +1,35 @@
 character_stats_results: {
  key: "TestBlood-CharacterStats-Default"
  value: {
-  final_stats: 1824.0244
-  final_stats: 577.5
-  final_stats: 1807.7015
-  final_stats: 174.9
-  final_stats: 228.8
+  final_stats: 2789.32409
+  final_stats: 500.5
+  final_stats: 2461.4425
+  final_stats: 179.3
+  final_stats: 233.2
   final_stats: 500
   final_stats: 109
-  final_stats: 289.69598
-  final_stats: 1323.05987
-  final_stats: 260
+  final_stats: 349.69598
+  final_stats: 1546.05987
+  final_stats: 270
   final_stats: 0
-  final_stats: 6486.6773
-  final_stats: 211
-  final_stats: 1893.62997
-  final_stats: 260
-  final_stats: 254.9
-  final_stats: 252.17246
+  final_stats: 8595.4255
+  final_stats: 271
+  final_stats: 2060.0738
+  final_stats: 270
+  final_stats: 479.9
+  final_stats: 254.17246
   final_stats: 1000
   final_stats: 0
   final_stats: 0
-  final_stats: 17457.5
-  final_stats: 1698.4
+  final_stats: 18841.5
+  final_stats: 1641.2
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 308.3574
-  final_stats: 456.0061
+  final_stats: 267.24308
+  final_stats: 697.33102
   final_stats: 0
-  final_stats: 26018.015
+  final_stats: 32555.425
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -46,879 +46,872 @@ character_stats_results: {
 dps_results: {
  key: "TestBlood-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 7254.49949
-  tps: 3592.06493
+  dps: 10754.83741
+  tps: 5401.20167
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 7165.61235
-  tps: 3586.98903
+  dps: 10494.11529
+  tps: 5314.22588
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 6955.15432
-  tps: 3469.32296
-  hps: 91.2816
+  dps: 10286.59456
+  tps: 5201.33594
+  hps: 94.38579
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 6955.15432
-  tps: 3469.32296
-  hps: 91.2816
+  dps: 10286.59456
+  tps: 5201.33594
+  hps: 94.38579
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 7270.70319
-  tps: 3601.19975
+  dps: 10777.77853
+  tps: 5413.64002
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 7061.44428
-  tps: 3507.02642
+  dps: 10224.75033
+  tps: 5137.44777
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 6110.86035
-  tps: 3041.04376
+  dps: 8064.37105
+  tps: 4066.44351
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 6029.80376
-  tps: 3006.27154
+  dps: 7983.01641
+  tps: 4028.95888
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5738.38546
-  tps: 2846.41166
+  dps: 7708.80943
+  tps: 3895.86593
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3517.64664
+  dps: 10748.51732
+  tps: 5289.94263
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 8643.88056
-  tps: 4353.93653
+  dps: 12536.68391
+  tps: 6395.68301
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 8742.4559
-  tps: 4416.72274
+  dps: 12642.97714
+  tps: 6456.99042
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 7392.09802
-  tps: 3666.22271
+  dps: 10974.55471
+  tps: 5519.82079
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
   hps: 64
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7060.09821
-  tps: 3525.65698
+  dps: 10444.38155
+  tps: 5289.11569
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7125.98003
-  tps: 3565.25429
+  dps: 10498.59297
+  tps: 5322.8224
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 7212.24797
-  tps: 3576.29432
+  dps: 10563.63196
+  tps: 5319.58268
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DarkrunedBattlegear"
  value: {
-  dps: 7055.44508
-  tps: 3510.95727
+  dps: 8971.55191
+  tps: 4522.13701
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DarkrunedPlate"
  value: {
-  dps: 6151.69772
-  tps: 3051.35052
- }
-}
-dps_results: {
- key: "TestBlood-AllItems-Death'sChoice-47464"
- value: {
-  dps: 7587.19169
-  tps: 3753.71492
+  dps: 7923.58393
+  tps: 3986.34677
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7022.82804
-  tps: 3505.53263
+  dps: 10392.16698
+  tps: 5260.49561
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 7436.16972
-  tps: 3729.43422
+  dps: 10920.8639
+  tps: 5556.86151
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 7463.47285
-  tps: 3750.57229
+  dps: 11000.765
+  tps: 5604.25014
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Defender'sCode-40257"
  value: {
-  dps: 6971.47602
-  tps: 3477.78924
+  dps: 10304.88702
+  tps: 5210.89732
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 7275.03652
-  tps: 3603.44032
+  dps: 10783.80284
+  tps: 5417.25461
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 7089.56569
-  tps: 3538.10697
+  dps: 10509.9685
+  tps: 5304.35857
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 7114.25264
-  tps: 3553.56034
+  dps: 10462.44736
+  tps: 5293.06414
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 7270.70319
-  tps: 3601.19975
+  dps: 10777.77853
+  tps: 5413.64002
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 7268.60957
-  tps: 3600.17477
+  dps: 10771.74883
+  tps: 5410.1607
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7066.1656
-  tps: 3514.00609
+  dps: 10439.68704
+  tps: 5258.59836
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7112.78642
-  tps: 3559.6433
+  dps: 10497.58646
+  tps: 5318.43418
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7049.27399
-  tps: 3520.2184
+  dps: 10430.31833
+  tps: 5281.25906
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7029.32211
-  tps: 3509.62963
+  dps: 10406.55428
+  tps: 5269.03391
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 7162.82199
-  tps: 3579.35268
+  dps: 10519.08369
+  tps: 5325.28465
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 7091.42238
-  tps: 3545.42297
+  dps: 10465.07659
+  tps: 5300.73012
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 7270.70319
-  tps: 3601.19975
+  dps: 10777.77853
+  tps: 5413.64002
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 7268.60957
-  tps: 3600.17477
+  dps: 10771.74883
+  tps: 5410.1607
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-IncisorFragment-37723"
  value: {
-  dps: 7145.96015
-  tps: 3575.49012
+  dps: 10524.77378
+  tps: 5335.37956
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 7279.06736
-  tps: 3604.26868
-  hps: 12.53201
+  dps: 10780.4067
+  tps: 5414.5567
+  hps: 16.33197
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-LastWord-50179"
  value: {
-  dps: 8304.51946
-  tps: 4163.65409
+  dps: 12219.1304
+  tps: 6212.62959
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-LastWord-50708"
  value: {
-  dps: 8366.98267
-  tps: 4198.16207
+  dps: 12288.94826
+  tps: 6251.43979
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 7119.82904
-  tps: 3550.3283
+  dps: 10537.06691
+  tps: 5331.18522
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7135.92013
-  tps: 3545.08962
+  dps: 10630.13863
+  tps: 5363.65131
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 6965.71288
-  tps: 3474.79962
+  dps: 10298.42661
+  tps: 5207.52016
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 7272.51872
-  tps: 3601.40491
+  dps: 10774.33253
+  tps: 5411.38412
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 7277.95222
-  tps: 3604.22127
+  dps: 10780.4067
+  tps: 5414.5567
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 6998.9854
-  tps: 3492.0597
+  dps: 10335.72473
+  tps: 5227.0176
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7004.63328
-  tps: 3494.98953
+  dps: 10342.05594
+  tps: 5230.32721
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7032.64174
-  tps: 3518.11312
+  dps: 10344.76619
+  tps: 5237.58139
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7039.14539
-  tps: 3522.01531
+  dps: 10353.27625
+  tps: 5242.68743
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 7388.67747
-  tps: 3664.47139
+  dps: 10964.43193
+  tps: 5513.87128
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ScourgeborneBattlegear"
  value: {
-  dps: 6714.14074
-  tps: 3332.50768
+  dps: 8598.72981
+  tps: 4298.67912
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ScourgebornePlate"
  value: {
-  dps: 6111.58936
-  tps: 3033.11719
+  dps: 7926.61748
+  tps: 3986.20418
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Scourgelord'sBattlegear"
  value: {
-  dps: 7684.98105
-  tps: 3869.55379
+  dps: 9833.54413
+  tps: 5019.12006
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Scourgelord'sPlate"
  value: {
-  dps: 6479.69318
-  tps: 3214.58474
+  dps: 8283.79281
+  tps: 4166.64725
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 6970.58017
-  tps: 3477.04693
+  dps: 10304.27901
+  tps: 5210.28873
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Shadowmourne-49623"
  value: {
-  dps: 9619.89706
-  tps: 4886.37063
+  dps: 13808.56331
+  tps: 7100.50507
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SoulPreserver-37111"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SouloftheDead-40382"
  value: {
-  dps: 7052.39046
-  tps: 3521.80189
+  dps: 10433.97649
+  tps: 5283.45396
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SparkofLife-37657"
  value: {
-  dps: 7022.90369
-  tps: 3501.65289
+  dps: 10377.60572
+  tps: 5250.58305
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 7184.46896
-  tps: 3569.90433
+  dps: 10402.17605
+  tps: 5250.56842
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-StormshroudArmor"
  value: {
-  dps: 5676.14876
-  tps: 2820.83611
+  dps: 7639.88369
+  tps: 3853.54147
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 7277.95222
-  tps: 3604.22127
+  dps: 10780.4067
+  tps: 5414.5567
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 7272.51872
-  tps: 3601.40491
+  dps: 10774.33253
+  tps: 5411.38412
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 7263.01009
-  tps: 3596.47626
+  dps: 10763.70274
+  tps: 5405.8321
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Thassarian'sBattlegear"
  value: {
-  dps: 7180.33672
-  tps: 3585.25646
+  dps: 9190.61767
+  tps: 4642.02628
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Thassarian'sPlate"
  value: {
-  dps: 6304.2692
-  tps: 3122.95067
+  dps: 8148.52516
+  tps: 4102.48775
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 6297.18494
-  tps: 3082.81939
+  dps: 8787.22488
+  tps: 4336.9956
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 7267.43446
-  tps: 3591.36134
+  dps: 10782.77825
+  tps: 5413.36636
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 7221.52976
-  tps: 3606.36335
+  dps: 10526.01489
+  tps: 5343.74696
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 7229.64432
-  tps: 3607.26483
+  dps: 10521.5377
+  tps: 5337.87843
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7006.03588
-  tps: 3479.20727
+  dps: 10323.3432
+  tps: 5189.9161
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 7249.42634
-  tps: 3589.43535
+  dps: 10748.51732
+  tps: 5397.90064
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6016.0907
-  tps: 2995.81386
+  dps: 7946.5183
+  tps: 4018.58564
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 5572.2676
-  tps: 2665.54983
+  dps: 7758.45516
+  tps: 3736.30682
  }
 }
 dps_results: {
  key: "TestBlood-AllItems-WingedTalisman-37844"
  value: {
-  dps: 6955.14712
-  tps: 3469.31864
+  dps: 10286.58252
+  tps: 5201.32871
  }
 }
 dps_results: {
  key: "TestBlood-Average-Default"
  value: {
-  dps: 7407.75036
-  tps: 3679.35209
+  dps: 11006.29667
+  tps: 5538.17409
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Human-Blood P1 -Basic--FullBuffs-LongMultiTarget"
+ key: "TestBlood-Settings-Human-Blood P3 -Basic--FullBuffs-LongMultiTarget"
  value: {
-  dps: 20042.2416
-  tps: 10225.23803
+  dps: 32425.42303
+  tps: 16656.61868
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Human-Blood P1 -Basic--FullBuffs-LongSingleTarget"
+ key: "TestBlood-Settings-Human-Blood P3 -Basic--FullBuffs-LongSingleTarget"
  value: {
-  dps: 7290.13746
-  tps: 3646.47181
+  dps: 10852.15867
+  tps: 5501.71363
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Human-Blood P1 -Basic--FullBuffs-ShortSingleTarget"
+ key: "TestBlood-Settings-Human-Blood P3 -Basic--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9389.51568
-  tps: 4150.51977
+  dps: 13925.67238
+  tps: 6323.88887
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Human-Blood P1 -Basic--NoBuffs-LongMultiTarget"
+ key: "TestBlood-Settings-Human-Blood P3 -Basic--NoBuffs-LongMultiTarget"
  value: {
-  dps: 10587.47794
-  tps: 5395.93411
+  dps: 17424.94757
+  tps: 8939.84816
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Human-Blood P1 -Basic--NoBuffs-LongSingleTarget"
+ key: "TestBlood-Settings-Human-Blood P3 -Basic--NoBuffs-LongSingleTarget"
  value: {
-  dps: 4119.74995
-  tps: 2063.67127
+  dps: 6229.21755
+  tps: 3165.56487
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Human-Blood P1 -Basic--NoBuffs-ShortSingleTarget"
+ key: "TestBlood-Settings-Human-Blood P3 -Basic--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4960.43121
-  tps: 2158.52011
+  dps: 7320.99306
+  tps: 3287.18623
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-Blood P1 -Basic--FullBuffs-LongMultiTarget"
+ key: "TestBlood-Settings-Orc-Blood P3 -Basic--FullBuffs-LongMultiTarget"
  value: {
-  dps: 20335.22812
-  tps: 10288.45122
+  dps: 32844.91465
+  tps: 16734.77262
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-Blood P1 -Basic--FullBuffs-LongSingleTarget"
+ key: "TestBlood-Settings-Orc-Blood P3 -Basic--FullBuffs-LongSingleTarget"
  value: {
-  dps: 7388.67747
-  tps: 3664.47139
+  dps: 10974.55471
+  tps: 5519.82079
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-Blood P1 -Basic--FullBuffs-ShortSingleTarget"
+ key: "TestBlood-Settings-Orc-Blood P3 -Basic--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9585.8367
-  tps: 4191.62899
+  dps: 14185.55866
+  tps: 6375.93319
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-Blood P1 -Basic--NoBuffs-LongMultiTarget"
+ key: "TestBlood-Settings-Orc-Blood P3 -Basic--NoBuffs-LongMultiTarget"
  value: {
-  dps: 10770.6032
-  tps: 5438.19164
+  dps: 17661.29459
+  tps: 8984.34245
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-Blood P1 -Basic--NoBuffs-LongSingleTarget"
+ key: "TestBlood-Settings-Orc-Blood P3 -Basic--NoBuffs-LongSingleTarget"
  value: {
-  dps: 4191.71974
-  tps: 2084.80319
+  dps: 6300.30738
+  tps: 3177.16631
  }
 }
 dps_results: {
- key: "TestBlood-Settings-Orc-Blood P1 -Basic--NoBuffs-ShortSingleTarget"
+ key: "TestBlood-Settings-Orc-Blood P3 -Basic--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5070.65498
-  tps: 2183.78113
+  dps: 7459.94244
+  tps: 3315.85124
  }
 }
 dps_results: {
  key: "TestBlood-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7014.65967
-  tps: 3502.02386
+  dps: 10467.12156
+  tps: 5295.96892
  }
 }
diff --git a/sim/deathknight/dps/TestFrost.results b/sim/deathknight/dps/TestFrost.results
index 0243992855..8108cbd70e 100644
--- a/sim/deathknight/dps/TestFrost.results
+++ b/sim/deathknight/dps/TestFrost.results
@@ -1,35 +1,35 @@
 character_stats_results: {
  key: "TestFrost-CharacterStats-Default"
  value: {
-  final_stats: 1716
-  final_stats: 573.1
-  final_stats: 1717.65
-  final_stats: 174.9
-  final_stats: 228.8
+  final_stats: 2584.296
+  final_stats: 544.5
+  final_stats: 2351.25
+  final_stats: 179.3
+  final_stats: 233.2
   final_stats: 500
   final_stats: 109
-  final_stats: 307
-  final_stats: 1220.05987
-  final_stats: 267
+  final_stats: 269
+  final_stats: 1592.05987
+  final_stats: 283
   final_stats: 0
-  final_stats: 6189.35472
-  final_stats: 405.36997
-  final_stats: 1787.39819
-  final_stats: 267
-  final_stats: 115
-  final_stats: 164.98748
+  final_stats: 8207.64426
+  final_stats: 367.36997
+  final_stats: 2138.39161
+  final_stats: 283
+  final_stats: 208
+  final_stats: 186.98748
   final_stats: 1000
   final_stats: 0
   final_stats: 0
-  final_stats: 17448.7
-  final_stats: 1639
+  final_stats: 18968.5
+  final_stats: 1700.6
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 306.00801
-  final_stats: 429
+  final_stats: 290.73698
+  final_stats: 646.074
   final_stats: 0
-  final_stats: 25117.5
+  final_stats: 31453.5
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -46,1222 +46,1047 @@ character_stats_results: {
 dps_results: {
  key: "TestFrost-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 8044.63287
-  tps: 4702.12713
+  dps: 11082.06883
+  tps: 6490.77374
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 8019.22811
-  tps: 4702.07192
+  dps: 11038.13477
+  tps: 6462.06369
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 7806.67435
-  tps: 4573.20979
-  hps: 61.33921
+  dps: 10852.3219
+  tps: 6352.92559
+  hps: 64.65047
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 7806.67435
-  tps: 4573.20979
-  hps: 61.33921
+  dps: 10852.3219
+  tps: 6352.92559
+  hps: 64.65047
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 8060.03794
-  tps: 4711.37018
+  dps: 11102.3787
+  tps: 6502.95967
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 7776.33163
-  tps: 4544.64255
+  dps: 10612.7623
+  tps: 6218.78683
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 6733.96501
-  tps: 3937.13031
+  dps: 8721.19094
+  tps: 5107.83834
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 6621.70895
-  tps: 3873.85802
+  dps: 8614.83081
+  tps: 5046.15923
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 6352.93797
-  tps: 3712.88707
+  dps: 8346.45652
+  tps: 4886.51115
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4604.49021
+  dps: 11074.81115
+  tps: 6356.69075
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 8243.05425
-  tps: 4821.17996
+  dps: 11372.09767
+  tps: 6664.79105
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 8243.05425
-  tps: 4821.17996
+  dps: 11372.09767
+  tps: 6664.79105
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 8248.78377
-  tps: 4824.61767
+  dps: 11380.01042
+  tps: 6669.5387
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
   hps: 42.66667
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7921.11839
-  tps: 4641.87622
+  dps: 10991.85659
+  tps: 6436.6464
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7970.57882
-  tps: 4672.31964
+  dps: 11020.36132
+  tps: 6453.45764
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 8048.68798
-  tps: 4707.75815
+  dps: 11091.5468
+  tps: 6486.28338
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkrunedBattlegear"
  value: {
-  dps: 7622.00029
-  tps: 4458.77463
+  dps: 9570.45442
+  tps: 5602.68015
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkrunedPlate"
  value: {
-  dps: 6759.0187
-  tps: 3946.71673
+  dps: 8519.21054
+  tps: 4981.27641
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DeadlyGladiator'sSigilofStrife-42620"
  value: {
-  dps: 7700.42774
-  tps: 4495.60405
- }
-}
-dps_results: {
- key: "TestFrost-AllItems-Death'sChoice-47464"
- value: {
-  dps: 8441.02431
-  tps: 4935.69807
+  dps: 10793.26034
+  tps: 6317.48865
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7901.67392
-  tps: 4630.20953
+  dps: 10969.56949
+  tps: 6423.27414
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 8230.30906
-  tps: 4819.81248
+  dps: 11432.07497
+  tps: 6693.86398
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 8302.7178
-  tps: 4866.98249
+  dps: 11507.98672
+  tps: 6740.93298
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7826.58817
-  tps: 4585.15808
+  dps: 10872.55688
+  tps: 6365.06658
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 8067.10309
-  tps: 4715.60926
+  dps: 11104.13437
+  tps: 6504.01307
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 7958.27231
-  tps: 4659.58706
+  dps: 11033.84501
+  tps: 6455.27185
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 7968.2384
-  tps: 4665.70196
+  dps: 10979.60891
+  tps: 6422.94426
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 8060.03794
-  tps: 4711.37018
+  dps: 11102.3787
+  tps: 6502.95967
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 8055.87311
-  tps: 4708.87128
+  dps: 11095.68148
+  tps: 6498.94134
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7887.42716
-  tps: 4615.29116
+  dps: 10938.1542
+  tps: 6391.20775
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7937.77137
-  tps: 4652.23602
+  dps: 10998.78479
+  tps: 6438.75424
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7907.19225
-  tps: 4633.52053
+  dps: 10978.76726
+  tps: 6428.7928
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7890.6298
-  tps: 4623.58306
+  dps: 10957.85488
+  tps: 6416.24537
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-FuriousGladiator'sSigilofStrife-42621"
  value: {
-  dps: 7701.24678
-  tps: 4496.09548
+  dps: 10794.15125
+  tps: 6318.0232
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 8049.52908
-  tps: 4718.92263
+  dps: 11099.56643
+  tps: 6501.27231
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 7928.63904
-  tps: 4646.72811
+  dps: 10945.33084
+  tps: 6409.27864
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-HatefulGladiator'sSigilofStrife-42619"
  value: {
-  dps: 7698.5388
-  tps: 4494.47069
+  dps: 10791.28192
+  tps: 6316.3016
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 8060.03794
-  tps: 4711.37018
+  dps: 11102.3787
+  tps: 6502.95967
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 8055.87311
-  tps: 4708.87128
+  dps: 11095.68148
+  tps: 6498.94134
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-IncisorFragment-37723"
  value: {
-  dps: 8014.64277
-  tps: 4697.99085
+  dps: 11091.51767
+  tps: 6496.44305
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 8069.70785
-  tps: 4717.17212
-  hps: 12.97738
+  dps: 11108.34559
+  tps: 6506.5398
+  hps: 16.93247
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-LastWord-50179"
  value: {
-  dps: 8243.05425
-  tps: 4821.17996
+  dps: 11372.09767
+  tps: 6664.79105
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-LastWord-50708"
  value: {
-  dps: 8243.05425
-  tps: 4821.17996
+  dps: 11372.09767
+  tps: 6664.79105
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 8006.88319
-  tps: 4691.13926
+  dps: 11038.81672
+  tps: 6458.39132
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7871.8891
-  tps: 4612.33864
+  dps: 11014.10938
+  tps: 6449.99808
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7819.6042
-  tps: 4580.9677
+  dps: 10865.44328
+  tps: 6360.79841
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 8064.06701
-  tps: 4713.78762
+  dps: 11101.95807
+  tps: 6502.70729
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 8070.07808
-  tps: 4717.39426
+  dps: 11108.34559
+  tps: 6506.5398
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 7859.92498
-  tps: 4605.16017
+  dps: 10906.51252
+  tps: 6385.43996
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7866.76927
-  tps: 4609.26674
+  dps: 10913.48385
+  tps: 6389.62276
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7833.01059
-  tps: 4588.70979
+  dps: 10833.80346
+  tps: 6342.34899
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7834.61791
-  tps: 4589.67418
+  dps: 10835.58967
+  tps: 6343.42072
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 8243.05425
-  tps: 4821.17996
+  dps: 11372.09767
+  tps: 6664.79105
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-RelentlessGladiator'sSigilofStrife-42622"
  value: {
-  dps: 7702.20233
-  tps: 4496.66881
+  dps: 10795.19066
+  tps: 6318.64684
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SavageGladiator'sSigilofStrife-42618"
  value: {
-  dps: 7698.28903
-  tps: 4494.32083
+  dps: 10791.0016
+  tps: 6316.13341
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ScourgeborneBattlegear"
  value: {
-  dps: 7407.02776
-  tps: 4334.00144
+  dps: 9345.60039
+  tps: 5473.81199
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ScourgebornePlate"
  value: {
-  dps: 6680.92369
-  tps: 3903.08619
+  dps: 8416.50559
+  tps: 4923.40601
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Scourgelord'sBattlegear"
  value: {
-  dps: 8434.6511
-  tps: 4944.24901
+  dps: 10501.56053
+  tps: 6161.79112
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Scourgelord'sPlate"
  value: {
-  dps: 7057.52487
-  tps: 4121.43985
+  dps: 8847.89838
+  tps: 5173.29023
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7820.27619
-  tps: 4581.37089
+  dps: 10865.98448
+  tps: 6361.12314
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Shadowmourne-49623"
  value: {
-  dps: 8243.05425
-  tps: 4821.17996
+  dps: 11372.09767
+  tps: 6664.79105
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigilofDeflection-45144"
  value: {
-  dps: 7696.33252
-  tps: 4493.14692
+  dps: 10788.80575
+  tps: 6314.8159
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigilofHauntedDreams-40715"
  value: {
-  dps: 7703.42254
-  tps: 4497.40093
+  dps: 10801.92998
+  tps: 6322.69044
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigilofInsolence-47672"
  value: {
-  dps: 7696.33252
-  tps: 4493.14692
+  dps: 10788.80575
+  tps: 6314.8159
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigilofVirulence-47673"
  value: {
-  dps: 8118.69311
-  tps: 4739.45673
+  dps: 11235.08221
+  tps: 6575.52601
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigiloftheBoneGryphon-50462"
  value: {
-  dps: 7696.33252
-  tps: 4493.14692
+  dps: 10788.80575
+  tps: 6314.8159
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigiloftheHangedMan-50459"
  value: {
-  dps: 8155.4097
-  tps: 4760.81156
+  dps: 11275.84434
+  tps: 6599.31299
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SigiloftheUnfalteringKnight-40714"
  value: {
-  dps: 7696.33252
-  tps: 4493.14692
+  dps: 10788.80575
+  tps: 6314.8159
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SoulPreserver-37111"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SouloftheDead-40382"
  value: {
-  dps: 7910.60472
-  tps: 4635.56801
+  dps: 10982.82604
+  tps: 6431.22807
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SparkofLife-37657"
  value: {
-  dps: 7885.97822
-  tps: 4618.37111
+  dps: 10953.33621
+  tps: 6410.14536
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 7976.96859
-  tps: 4676.1679
+  dps: 10986.41653
+  tps: 6431.36764
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-StormshroudArmor"
  value: {
-  dps: 6297.37926
-  tps: 3682.86361
+  dps: 8230.05781
+  tps: 4818.41382
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 8070.07808
-  tps: 4717.39426
+  dps: 11108.34559
+  tps: 6506.5398
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 8064.06701
-  tps: 4713.78762
+  dps: 11101.95807
+  tps: 6502.70729
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 8053.54764
-  tps: 4707.476
+  dps: 11090.77993
+  tps: 6496.0004
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Thassarian'sBattlegear"
  value: {
-  dps: 7685.91749
-  tps: 4498.34592
+  dps: 9607.37222
+  tps: 5627.64452
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Thassarian'sPlate"
  value: {
-  dps: 6731.81551
-  tps: 3934.55269
+  dps: 8473.49769
+  tps: 4956.08872
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 7255.77247
-  tps: 4233.99297
+  dps: 9301.30431
+  tps: 5431.90091
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 8090.79221
-  tps: 4727.73861
+  dps: 11102.07382
+  tps: 6498.78015
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 7985.42571
-  tps: 4682.21245
+  dps: 11122.86734
+  tps: 6513.99034
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 8003.03606
-  tps: 4690.19018
+  dps: 11125.55097
+  tps: 6516.99338
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7811.05343
-  tps: 4572.00664
+  dps: 10845.68599
+  tps: 6346.72272
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 8038.51998
-  tps: 4698.4594
+  dps: 11074.81115
+  tps: 6486.41913
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6619.26344
-  tps: 3872.66665
+  dps: 8617.71783
+  tps: 5048.46892
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 7675.06471
-  tps: 4480.15184
+  dps: 10248.51298
+  tps: 5988.15544
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7806.80026
-  tps: 4573.28534
+  dps: 10852.40166
+  tps: 6352.97344
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-WrathfulGladiator'sSigilofStrife-51417"
  value: {
-  dps: 7703.29439
-  tps: 4497.32404
+  dps: 10796.37855
+  tps: 6319.35958
  }
 }
 dps_results: {
  key: "TestFrost-Average-Default"
  value: {
-  dps: 8204.67237
-  tps: 4800.09735
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P1-Basic--FullBuffs-LongMultiTarget"
- value: {
-  dps: 26036.02639
-  tps: 15506.08645
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P1-Basic--FullBuffs-LongSingleTarget"
- value: {
-  dps: 8180.68195
-  tps: 4790.3997
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P1-Basic--FullBuffs-ShortSingleTarget"
- value: {
-  dps: 9342.12196
-  tps: 5327.87559
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P1-Basic--NoBuffs-LongMultiTarget"
- value: {
-  dps: 13316.56807
-  tps: 7915.79793
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P1-Basic--NoBuffs-LongSingleTarget"
- value: {
-  dps: 4875.41056
-  tps: 2849.5264
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P1-Basic--NoBuffs-ShortSingleTarget"
- value: {
-  dps: 5138.55986
-  tps: 2930.78185
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P1-Desync--FullBuffs-LongMultiTarget"
- value: {
-  dps: 25268.52244
-  tps: 15049.32639
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P1-Desync--FullBuffs-LongSingleTarget"
- value: {
-  dps: 8239.71407
-  tps: 4830.36449
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P1-Desync--FullBuffs-ShortSingleTarget"
- value: {
-  dps: 9197.61833
-  tps: 5238.57638
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P1-Desync--NoBuffs-LongMultiTarget"
- value: {
-  dps: 13281.1632
-  tps: 7896.95056
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P1-Desync--NoBuffs-LongSingleTarget"
- value: {
-  dps: 4907.92079
-  tps: 2872.81088
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P1-Desync--NoBuffs-ShortSingleTarget"
- value: {
-  dps: 5099.05025
-  tps: 2906.44533
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P2-Basic--FullBuffs-LongMultiTarget"
- value: {
-  dps: 29978.6688
-  tps: 17854.33899
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P2-Basic--FullBuffs-LongSingleTarget"
- value: {
-  dps: 9956.74402
-  tps: 5841.34324
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P2-Basic--FullBuffs-ShortSingleTarget"
- value: {
-  dps: 11494.10471
-  tps: 6587.45145
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P2-Basic--NoBuffs-LongMultiTarget"
- value: {
-  dps: 15967.56632
-  tps: 9496.57527
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P2-Basic--NoBuffs-LongSingleTarget"
- value: {
-  dps: 5984.93357
-  tps: 3505.74637
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P2-Basic--NoBuffs-ShortSingleTarget"
- value: {
-  dps: 6476.5195
-  tps: 3713.44612
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P2-Desync--FullBuffs-LongMultiTarget"
- value: {
-  dps: 29591.98161
-  tps: 17627.5871
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P2-Desync--FullBuffs-LongSingleTarget"
- value: {
-  dps: 10015.47723
-  tps: 5882.88567
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P2-Desync--FullBuffs-ShortSingleTarget"
- value: {
-  dps: 11320.16606
-  tps: 6479.88819
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P2-Desync--NoBuffs-LongMultiTarget"
- value: {
-  dps: 16044.76278
-  tps: 9546.37783
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P2-Desync--NoBuffs-LongSingleTarget"
- value: {
-  dps: 6025.63272
-  tps: 3532.8378
- }
-}
-dps_results: {
- key: "TestFrost-Settings-Human-Frost P2-Desync--NoBuffs-ShortSingleTarget"
- value: {
-  dps: 6421.7701
-  tps: 3681.67816
+  dps: 11299.03365
+  tps: 6621.67078
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P1-Basic--FullBuffs-LongMultiTarget"
+ key: "TestFrost-Settings-Human-Frost P3-Basic--FullBuffs-LongMultiTarget"
  value: {
-  dps: 25827.51946
-  tps: 15375.47549
+  dps: 37746.32071
+  tps: 22501.16355
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P1-Basic--FullBuffs-LongSingleTarget"
+ key: "TestFrost-Settings-Human-Frost P3-Basic--FullBuffs-LongSingleTarget"
  value: {
-  dps: 8243.05425
-  tps: 4821.17996
+  dps: 11328.86941
+  tps: 6646.57683
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P1-Basic--FullBuffs-ShortSingleTarget"
+ key: "TestFrost-Settings-Human-Frost P3-Basic--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9378.34776
-  tps: 5336.13555
+  dps: 13061.91024
+  tps: 7479.79583
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P1-Basic--NoBuffs-LongMultiTarget"
+ key: "TestFrost-Settings-Human-Frost P3-Basic--NoBuffs-LongMultiTarget"
  value: {
-  dps: 13561.7895
-  tps: 8057.75824
+  dps: 19223.50961
+  tps: 11440.37548
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P1-Basic--NoBuffs-LongSingleTarget"
+ key: "TestFrost-Settings-Human-Frost P3-Basic--NoBuffs-LongSingleTarget"
  value: {
-  dps: 4894.28064
-  tps: 2858.52798
+  dps: 6773.58767
+  tps: 3968.81739
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P1-Basic--NoBuffs-ShortSingleTarget"
+ key: "TestFrost-Settings-Human-Frost P3-Basic--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5211.63559
-  tps: 2968.53942
+  dps: 7305.01835
+  tps: 4185.81786
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P1-Desync--FullBuffs-LongMultiTarget"
+ key: "TestFrost-Settings-Human-Frost P3-Desync--FullBuffs-LongMultiTarget"
  value: {
-  dps: 25695.99308
-  tps: 15299.44551
+  dps: 36538.51786
+  tps: 21780.14541
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P1-Desync--FullBuffs-LongSingleTarget"
+ key: "TestFrost-Settings-Human-Frost P3-Desync--FullBuffs-LongSingleTarget"
  value: {
-  dps: 8236.99353
-  tps: 4823.42788
+  dps: 11311.99737
+  tps: 6643.07283
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P1-Desync--FullBuffs-ShortSingleTarget"
+ key: "TestFrost-Settings-Human-Frost P3-Desync--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9279.83491
-  tps: 5274.38255
+  dps: 12892.54923
+  tps: 7373.00522
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P1-Desync--NoBuffs-LongMultiTarget"
+ key: "TestFrost-Settings-Human-Frost P3-Desync--NoBuffs-LongMultiTarget"
  value: {
-  dps: 13415.27489
-  tps: 7973.64934
+  dps: 19505.3895
+  tps: 11613.09894
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P1-Desync--NoBuffs-LongSingleTarget"
+ key: "TestFrost-Settings-Human-Frost P3-Desync--NoBuffs-LongSingleTarget"
  value: {
-  dps: 4889.56363
-  tps: 2857.80844
+  dps: 6826.08821
+  tps: 4004.70027
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P1-Desync--NoBuffs-ShortSingleTarget"
+ key: "TestFrost-Settings-Human-Frost P3-Desync--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5130.52958
-  tps: 2918.70103
+  dps: 7214.35823
+  tps: 4129.096
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P2-Basic--FullBuffs-LongMultiTarget"
+ key: "TestFrost-Settings-Orc-Frost P3-Basic--FullBuffs-LongMultiTarget"
  value: {
-  dps: 30008.93774
-  tps: 17869.58318
+  dps: 37080.37833
+  tps: 22092.5078
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P2-Basic--FullBuffs-LongSingleTarget"
+ key: "TestFrost-Settings-Orc-Frost P3-Basic--FullBuffs-LongSingleTarget"
  value: {
-  dps: 9998.68616
-  tps: 5859.51354
+  dps: 11372.09767
+  tps: 6664.79105
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P2-Basic--FullBuffs-ShortSingleTarget"
+ key: "TestFrost-Settings-Orc-Frost P3-Basic--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 11588.4308
-  tps: 6626.71922
+  dps: 13129.24014
+  tps: 7503.0169
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P2-Basic--NoBuffs-LongMultiTarget"
+ key: "TestFrost-Settings-Orc-Frost P3-Basic--NoBuffs-LongMultiTarget"
  value: {
-  dps: 15756.177
-  tps: 9367.10136
+  dps: 19187.85994
+  tps: 11413.6731
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P2-Basic--NoBuffs-LongSingleTarget"
+ key: "TestFrost-Settings-Orc-Frost P3-Basic--NoBuffs-LongSingleTarget"
  value: {
-  dps: 6028.89905
-  tps: 3528.69483
+  dps: 6813.66049
+  tps: 3988.46658
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P2-Basic--NoBuffs-ShortSingleTarget"
+ key: "TestFrost-Settings-Orc-Frost P3-Basic--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 6520.38779
-  tps: 3732.26504
+  dps: 7352.9856
+  tps: 4204.88245
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P2-Desync--FullBuffs-LongMultiTarget"
+ key: "TestFrost-Settings-Orc-Frost P3-Desync--FullBuffs-LongMultiTarget"
  value: {
-  dps: 29918.87255
-  tps: 17817.5789
+  dps: 36450.97829
+  tps: 21719.92866
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P2-Desync--FullBuffs-LongSingleTarget"
+ key: "TestFrost-Settings-Orc-Frost P3-Desync--FullBuffs-LongSingleTarget"
  value: {
-  dps: 10016.24627
-  tps: 5875.97764
+  dps: 11346.32896
+  tps: 6655.57112
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P2-Desync--FullBuffs-ShortSingleTarget"
+ key: "TestFrost-Settings-Orc-Frost P3-Desync--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 11403.65097
-  tps: 6513.46362
+  dps: 12928.14238
+  tps: 7377.58783
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P2-Desync--NoBuffs-LongMultiTarget"
+ key: "TestFrost-Settings-Orc-Frost P3-Desync--NoBuffs-LongMultiTarget"
  value: {
-  dps: 16053.35174
-  tps: 9547.51331
+  dps: 19454.78095
+  tps: 11578.6041
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P2-Desync--NoBuffs-LongSingleTarget"
+ key: "TestFrost-Settings-Orc-Frost P3-Desync--NoBuffs-LongSingleTarget"
  value: {
-  dps: 6061.73566
-  tps: 3550.63376
+  dps: 6859.35239
+  tps: 4019.44566
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Orc-Frost P2-Desync--NoBuffs-ShortSingleTarget"
+ key: "TestFrost-Settings-Orc-Frost P3-Desync--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 6465.21765
-  tps: 3700.27788
+  dps: 7251.92292
+  tps: 4142.3065
  }
 }
 dps_results: {
  key: "TestFrost-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7912.27313
-  tps: 4636.44054
+  dps: 11027.93101
+  tps: 6471.82959
  }
 }
diff --git a/sim/deathknight/dps/TestFrostUH.results b/sim/deathknight/dps/TestFrostUH.results
index 1b70a93b6b..06f5263e6d 100644
--- a/sim/deathknight/dps/TestFrostUH.results
+++ b/sim/deathknight/dps/TestFrostUH.results
@@ -1,35 +1,35 @@
 character_stats_results: {
  key: "TestFrostUH-CharacterStats-Default"
  value: {
-  final_stats: 1767.48
-  final_stats: 573.1
-  final_stats: 1717.65
-  final_stats: 174.9
-  final_stats: 228.8
+  final_stats: 2661.82488
+  final_stats: 544.5
+  final_stats: 2351.25
+  final_stats: 179.3
+  final_stats: 233.2
   final_stats: 500
   final_stats: 109
-  final_stats: 385.69598
-  final_stats: 990.52994
-  final_stats: 267
+  final_stats: 347.69598
+  final_stats: 1362.52994
+  final_stats: 283
   final_stats: 0
-  final_stats: 5769.456
-  final_stats: 405.36997
-  final_stats: 1557.86826
-  final_stats: 267
-  final_stats: 115
-  final_stats: 164.98748
+  final_stats: 7798.61474
+  final_stats: 367.36997
+  final_stats: 1908.86168
+  final_stats: 283
+  final_stats: 208
+  final_stats: 186.98748
   final_stats: 1000
   final_stats: 0
   final_stats: 0
-  final_stats: 17448.7
-  final_stats: 1639
+  final_stats: 18968.5
+  final_stats: 1700.6
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 306.00801
-  final_stats: 441.87
+  final_stats: 290.73698
+  final_stats: 665.45622
   final_stats: 0
-  final_stats: 25117.5
+  final_stats: 31453.5
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -46,1054 +46,963 @@ character_stats_results: {
 dps_results: {
  key: "TestFrostUH-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 8016.12167
-  tps: 5728.20367
+  dps: 11171.28344
+  tps: 7960.80312
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 7804.42158
-  tps: 5572.39241
-  hps: 60.92312
+  dps: 10938.45052
+  tps: 7787.60753
+  hps: 60.89457
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 7804.42158
-  tps: 5572.39241
-  hps: 60.92312
+  dps: 10938.45052
+  tps: 7787.60753
+  hps: 60.89457
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 8123.55785
-  tps: 5780.23799
+  dps: 11284.08002
+  tps: 8041.99084
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 7807.37147
-  tps: 5559.06621
+  dps: 10636.64956
+  tps: 7585.15797
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 6600.42287
-  tps: 4698.47465
+  dps: 8644.80776
+  tps: 6158.61236
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 6541.62789
-  tps: 4663.47495
+  dps: 8572.94608
+  tps: 6116.0937
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 6329.315
-  tps: 4508.18053
+  dps: 8317.48936
+  tps: 5925.96532
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5648.5647
+  dps: 11251.54421
+  tps: 7857.68359
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 8284.58508
-  tps: 5898.75403
+  dps: 11526.14188
+  tps: 8220.14837
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 8284.58508
-  tps: 5898.75403
+  dps: 11526.14188
+  tps: 8220.14837
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 8289.33102
-  tps: 5902.24704
+  dps: 11533.97826
+  tps: 8225.91595
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
   hps: 42.66667
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7931.65054
-  tps: 5666.03292
+  dps: 11122.24898
+  tps: 7922.88319
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7978.10384
-  tps: 5700.22255
+  dps: 11174.05936
+  tps: 7962.84105
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 8073.82212
-  tps: 5749.8722
+  dps: 11204.29879
+  tps: 7962.82312
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-DarkrunedBattlegear"
  value: {
-  dps: 7650.91269
-  tps: 5447.5007
+  dps: 9762.11409
+  tps: 6956.38367
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-DarkrunedPlate"
  value: {
-  dps: 6697.90512
-  tps: 4756.63285
+  dps: 8547.02718
+  tps: 6077.98008
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-DeadlyGladiator'sSigilofStrife-42620"
  value: {
-  dps: 7701.2662
-  tps: 5469.43133
- }
-}
-dps_results: {
- key: "TestFrostUH-AllItems-Death'sChoice-47464"
- value: {
-  dps: 8494.26636
-  tps: 6044.75985
+  dps: 10925.71045
+  tps: 7778.23084
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7901.95746
-  tps: 5644.17882
+  dps: 11089.08278
+  tps: 7898.47287
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 8312.42951
-  tps: 5936.71785
+  dps: 11610.23825
+  tps: 8268.87565
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 8338.55787
-  tps: 5958.27598
+  dps: 11630.61002
+  tps: 8289.76084
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 8127.61476
-  tps: 5783.22388
+  dps: 11292.13108
+  tps: 8047.91642
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 7987.21352
-  tps: 5702.677
+  dps: 11141.8117
+  tps: 7924.62083
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 7944.6961
-  tps: 5668.71611
+  dps: 11148.59938
+  tps: 7930.97759
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 8123.55785
-  tps: 5780.23799
+  dps: 11284.08002
+  tps: 8041.99084
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 8120.12725
-  tps: 5777.71307
+  dps: 11278.25086
+  tps: 8037.70057
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7893.73532
-  tps: 5629.63242
+  dps: 11008.84688
+  tps: 7825.63226
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7965.36016
-  tps: 5690.8432
+  dps: 11178.50956
+  tps: 7965.93136
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7916.57705
-  tps: 5654.93883
+  dps: 11104.88592
+  tps: 7910.10398
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7895.66098
-  tps: 5639.5446
+  dps: 11069.57051
+  tps: 7884.11184
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-FuriousGladiator'sSigilofStrife-42621"
  value: {
-  dps: 7702.11242
-  tps: 5470.05416
+  dps: 10926.95511
+  tps: 7779.1469
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 8057.66879
-  tps: 5758.78235
+  dps: 11194.66719
+  tps: 7976.18299
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 7920.12227
-  tps: 5657.54811
+  dps: 11093.07695
+  tps: 7902.53231
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-HatefulGladiator'sSigilofStrife-42619"
  value: {
-  dps: 7699.37
-  tps: 5468.03573
+  dps: 10923.03777
+  tps: 7776.26374
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 8123.55785
-  tps: 5780.23799
+  dps: 11284.08002
+  tps: 8041.99084
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 8120.12725
-  tps: 5777.71307
+  dps: 11278.25086
+  tps: 8037.70057
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-IncisorFragment-37723"
  value: {
-  dps: 8011.86823
-  tps: 5725.07314
+  dps: 11172.15699
+  tps: 7959.61549
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 8134.5303
-  tps: 5788.31371
-  hps: 12.85179
+  dps: 11286.59546
+  tps: 8043.8422
+  hps: 16.40824
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-LastWord-50179"
  value: {
-  dps: 8284.58508
-  tps: 5898.75403
+  dps: 11526.14188
+  tps: 8220.14837
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-LastWord-50708"
  value: {
-  dps: 8284.58508
-  tps: 5898.75403
+  dps: 11526.14188
+  tps: 8220.14837
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 7958.90255
-  tps: 5680.98373
+  dps: 11247.18119
+  tps: 8007.31419
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7890.52033
-  tps: 5635.76109
+  dps: 11124.58698
+  tps: 7924.60396
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 8128.00097
-  tps: 5783.50813
+  dps: 11279.91903
+  tps: 8038.92835
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 8134.28825
-  tps: 5788.13556
+  dps: 11286.59546
+  tps: 8043.8422
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7818.53681
-  tps: 5582.78121
+  dps: 10987.12685
+  tps: 7823.58412
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7820.32938
-  tps: 5584.10055
+  dps: 10989.24224
+  tps: 7825.14105
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 8284.58508
-  tps: 5898.75403
+  dps: 11526.14188
+  tps: 8220.14837
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-RelentlessGladiator'sSigilofStrife-42622"
  value: {
-  dps: 7703.09968
-  tps: 5470.78078
+  dps: 10928.40721
+  tps: 7780.21565
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SavageGladiator'sSigilofStrife-42618"
  value: {
-  dps: 7699.10567
-  tps: 5467.84119
+  dps: 10922.63581
+  tps: 7775.9679
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ScourgeborneBattlegear"
  value: {
-  dps: 7423.8507
-  tps: 5290.06198
+  dps: 9425.54593
+  tps: 6723.48002
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ScourgebornePlate"
  value: {
-  dps: 6617.04589
-  tps: 4701.03538
+  dps: 8504.15571
+  tps: 6045.68916
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Scourgelord'sBattlegear"
  value: {
-  dps: 8496.30758
-  tps: 6063.08171
+  dps: 10613.96969
+  tps: 7579.91803
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Scourgelord'sPlate"
  value: {
-  dps: 7080.54748
-  tps: 5024.9055
+  dps: 8884.65191
+  tps: 6315.01929
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Shadowmourne-49623"
  value: {
-  dps: 8284.58508
-  tps: 5898.75403
+  dps: 11526.14188
+  tps: 8220.14837
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SigilofDeflection-45144"
  value: {
-  dps: 7697.03508
-  tps: 5466.31723
+  dps: 10919.48716
+  tps: 7773.65049
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SigilofHauntedDreams-40715"
  value: {
-  dps: 7705.06342
-  tps: 5472.22609
+  dps: 10934.3049
+  tps: 7784.55635
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SigilofInsolence-47672"
  value: {
-  dps: 7697.03508
-  tps: 5466.31723
+  dps: 10919.48716
+  tps: 7773.65049
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SigilofVirulence-47673"
  value: {
-  dps: 8156.23953
-  tps: 5790.4257
+  dps: 11403.71892
+  tps: 8116.41258
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SigiloftheBoneGryphon-50462"
  value: {
-  dps: 7697.03508
-  tps: 5466.31723
+  dps: 10919.48716
+  tps: 7773.65049
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SigiloftheHangedMan-50459"
  value: {
-  dps: 8195.78821
-  tps: 5818.21626
+  dps: 11446.71446
+  tps: 8146.76221
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SigiloftheUnfalteringKnight-40714"
  value: {
-  dps: 7697.03508
-  tps: 5466.31723
+  dps: 10919.48716
+  tps: 7773.65049
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SoulPreserver-37111"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SouloftheDead-40382"
  value: {
-  dps: 7919.96937
-  tps: 5657.43558
+  dps: 11107.49706
+  tps: 7912.02578
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SparkofLife-37657"
  value: {
-  dps: 7768.66296
-  tps: 5545.02013
+  dps: 11038.9129
+  tps: 7856.32342
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 7875.60536
-  tps: 5624.62186
+  dps: 11211.40367
+  tps: 7989.13801
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-StormshroudArmor"
  value: {
-  dps: 6274.36745
-  tps: 4470.35965
+  dps: 8163.52543
+  tps: 5817.85199
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 8134.28825
-  tps: 5788.13556
+  dps: 11286.59546
+  tps: 8043.8422
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 8128.00097
-  tps: 5783.50813
+  dps: 11279.91903
+  tps: 8038.92835
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 8116.99824
-  tps: 5775.41011
+  dps: 11268.23528
+  tps: 8030.32911
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Thassarian'sBattlegear"
  value: {
-  dps: 7667.6375
-  tps: 5460.86711
+  dps: 9761.81699
+  tps: 6959.75829
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Thassarian'sPlate"
  value: {
-  dps: 6654.60061
-  tps: 4726.00941
+  dps: 8589.26388
+  tps: 6105.116
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 7276.74137
-  tps: 5167.22336
+  dps: 9501.80604
+  tps: 6745.04481
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 8172.74836
-  tps: 5814.69036
+  dps: 11344.18626
+  tps: 8077.14692
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 7944.26322
-  tps: 5675.24535
+  dps: 11281.81341
+  tps: 8040.02878
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 8016.71285
-  tps: 5729.95589
+  dps: 11327.31766
+  tps: 8071.82236
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7776.46864
-  tps: 5550.2495
+  dps: 10933.04413
+  tps: 7773.76503
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 8101.28005
-  tps: 5763.84153
+  dps: 11251.54421
+  tps: 8018.04448
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6556.02873
-  tps: 4674.95034
+  dps: 8618.76109
+  tps: 6148.7341
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 7745.60392
-  tps: 5501.28635
+  dps: 10408.22106
+  tps: 7399.84096
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7804.49499
-  tps: 5572.44644
+  dps: 10938.51004
+  tps: 7787.65134
  }
 }
 dps_results: {
  key: "TestFrostUH-AllItems-WrathfulGladiator'sSigilofStrife-51417"
  value: {
-  dps: 7704.22798
-  tps: 5471.61121
+  dps: 10930.06676
+  tps: 7781.43708
  }
 }
 dps_results: {
  key: "TestFrostUH-Average-Default"
  value: {
-  dps: 8207.42606
-  tps: 5846.72856
+  dps: 11458.80401
+  tps: 8174.12737
  }
 }
 dps_results: {
  key: "TestFrostUH-Settings-Human-Frost P1-Basic--FullBuffs-LongMultiTarget"
  value: {
-  dps: 20628.68216
-  tps: 15002.02665
+  dps: 29413.57644
+  tps: 21403.7089
  }
 }
 dps_results: {
  key: "TestFrostUH-Settings-Human-Frost P1-Basic--FullBuffs-LongSingleTarget"
  value: {
-  dps: 8194.95345
-  tps: 5843.65919
+  dps: 11435.76771
+  tps: 8168.25176
  }
 }
 dps_results: {
  key: "TestFrostUH-Settings-Human-Frost P1-Basic--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9438.57473
-  tps: 6491.23599
+  dps: 13455.89041
+  tps: 9289.49688
  }
 }
 dps_results: {
  key: "TestFrostUH-Settings-Human-Frost P1-Basic--NoBuffs-LongMultiTarget"
  value: {
-  dps: 10360.28809
-  tps: 7513.84569
+  dps: 15461.05969
+  tps: 11227.96856
  }
 }
 dps_results: {
  key: "TestFrostUH-Settings-Human-Frost P1-Basic--NoBuffs-LongSingleTarget"
  value: {
-  dps: 4706.91499
-  tps: 3345.71755
+  dps: 6710.09669
+  tps: 4778.96894
  }
 }
 dps_results: {
  key: "TestFrostUH-Settings-Human-Frost P1-Basic--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5179.01401
-  tps: 3566.08499
- }
-}
-dps_results: {
- key: "TestFrostUH-Settings-Human-Frost P2-Basic--FullBuffs-LongMultiTarget"
- value: {
-  dps: 23873.56252
-  tps: 17360.54989
- }
-}
-dps_results: {
- key: "TestFrostUH-Settings-Human-Frost P2-Basic--FullBuffs-LongSingleTarget"
- value: {
-  dps: 10024.31076
-  tps: 7161.78543
- }
-}
-dps_results: {
- key: "TestFrostUH-Settings-Human-Frost P2-Basic--FullBuffs-ShortSingleTarget"
- value: {
-  dps: 11760.55987
-  tps: 8125.93315
- }
-}
-dps_results: {
- key: "TestFrostUH-Settings-Human-Frost P2-Basic--NoBuffs-LongMultiTarget"
- value: {
-  dps: 12398.49471
-  tps: 8998.3024
- }
-}
-dps_results: {
- key: "TestFrostUH-Settings-Human-Frost P2-Basic--NoBuffs-LongSingleTarget"
- value: {
-  dps: 5852.03716
-  tps: 4171.60562
- }
-}
-dps_results: {
- key: "TestFrostUH-Settings-Human-Frost P2-Basic--NoBuffs-ShortSingleTarget"
- value: {
-  dps: 6529.38004
-  tps: 4516.96081
+  dps: 7513.53269
+  tps: 5197.99432
  }
 }
 dps_results: {
  key: "TestFrostUH-Settings-Orc-Frost P1-Basic--FullBuffs-LongMultiTarget"
  value: {
-  dps: 19982.73406
-  tps: 14516.875
+  dps: 29381.11924
+  tps: 21368.61531
  }
 }
 dps_results: {
  key: "TestFrostUH-Settings-Orc-Frost P1-Basic--FullBuffs-LongSingleTarget"
  value: {
-  dps: 8284.58508
-  tps: 5898.75403
+  dps: 11526.14188
+  tps: 8220.14837
  }
 }
 dps_results: {
  key: "TestFrostUH-Settings-Orc-Frost P1-Basic--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9554.80646
-  tps: 6553.35516
+  dps: 13579.29903
+  tps: 9349.76382
  }
 }
 dps_results: {
  key: "TestFrostUH-Settings-Orc-Frost P1-Basic--NoBuffs-LongMultiTarget"
  value: {
-  dps: 10186.73465
-  tps: 7379.49905
+  dps: 15128.42944
+  tps: 10975.67352
  }
 }
 dps_results: {
  key: "TestFrostUH-Settings-Orc-Frost P1-Basic--NoBuffs-LongSingleTarget"
  value: {
-  dps: 4657.93525
-  tps: 3305.62596
+  dps: 6676.9877
+  tps: 4747.59169
  }
 }
 dps_results: {
  key: "TestFrostUH-Settings-Orc-Frost P1-Basic--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5191.42578
-  tps: 3564.55079
- }
-}
-dps_results: {
- key: "TestFrostUH-Settings-Orc-Frost P2-Basic--FullBuffs-LongMultiTarget"
- value: {
-  dps: 23788.03345
-  tps: 17283.90426
- }
-}
-dps_results: {
- key: "TestFrostUH-Settings-Orc-Frost P2-Basic--FullBuffs-LongSingleTarget"
- value: {
-  dps: 10131.12821
-  tps: 7225.71557
- }
-}
-dps_results: {
- key: "TestFrostUH-Settings-Orc-Frost P2-Basic--FullBuffs-ShortSingleTarget"
- value: {
-  dps: 11856.73408
-  tps: 8170.44633
- }
-}
-dps_results: {
- key: "TestFrostUH-Settings-Orc-Frost P2-Basic--NoBuffs-LongMultiTarget"
- value: {
-  dps: 11861.49705
-  tps: 8596.79021
- }
-}
-dps_results: {
- key: "TestFrostUH-Settings-Orc-Frost P2-Basic--NoBuffs-LongSingleTarget"
- value: {
-  dps: 5832.13804
-  tps: 4151.11737
- }
-}
-dps_results: {
- key: "TestFrostUH-Settings-Orc-Frost P2-Basic--NoBuffs-ShortSingleTarget"
- value: {
-  dps: 6584.98282
-  tps: 4545.45701
+  dps: 7552.43194
+  tps: 5209.38453
  }
 }
 dps_results: {
  key: "TestFrostUH-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7377.36773
-  tps: 5252.60665
+  dps: 10648.16317
+  tps: 7599.72515
  }
 }
diff --git a/sim/deathknight/dps/TestUnholy.results b/sim/deathknight/dps/TestUnholy.results
index 80d39736c1..7df6abafa4 100644
--- a/sim/deathknight/dps/TestUnholy.results
+++ b/sim/deathknight/dps/TestUnholy.results
@@ -1,35 +1,35 @@
 character_stats_results: {
  key: "TestUnholy-CharacterStats-Default"
  value: {
-  final_stats: 1767.48
-  final_stats: 528
-  final_stats: 1720.95
-  final_stats: 174.9
-  final_stats: 228.8
+  final_stats: 2646.50672
+  final_stats: 544.5
+  final_stats: 2355.65
+  final_stats: 179.3
+  final_stats: 233.2
   final_stats: 500
   final_stats: 109
-  final_stats: 327.69598
-  final_stats: 1023.2479
-  final_stats: 448
+  final_stats: 365.69598
+  final_stats: 1404.2479
+  final_stats: 473
   final_stats: 0
-  final_stats: 5677.056
-  final_stats: 347.36997
-  final_stats: 1557.46046
-  final_stats: 448
-  final_stats: 25
-  final_stats: 207.98748
+  final_stats: 8063.01478
+  final_stats: 385.36997
+  final_stats: 1950.57964
+  final_stats: 473
+  final_stats: 0
+  final_stats: 194.98748
   final_stats: 1000
   final_stats: 0
   final_stats: 0
-  final_stats: 17324.5
-  final_stats: 1546.6
-  final_stats: 31
+  final_stats: 18962.5
+  final_stats: 1998.7
+  final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 281.92677
-  final_stats: 475.87
+  final_stats: 290.73698
+  final_stats: 661.62668
   final_stats: 0
-  final_stats: 25150.5
+  final_stats: 31497.5
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -46,1184 +46,1088 @@ character_stats_results: {
 dps_results: {
  key: "TestUnholy-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 7414.48195
-  tps: 4783.96802
-  hps: 369.59868
+  dps: 11386.58941
+  tps: 7526.51032
+  hps: 425.1668
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 7414.48195
-  tps: 4783.96802
-  hps: 383.43105
+  dps: 11386.58941
+  tps: 7526.51032
+  hps: 438.86369
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 270.31002
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 324.63789
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 7607.91025
-  tps: 4955.64652
-  hps: 264.72419
+  dps: 11638.42355
+  tps: 7738.99656
+  hps: 320.58623
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 7414.50365
-  tps: 4783.92678
-  hps: 354.03666
+  dps: 11386.68528
+  tps: 7526.58441
+  hps: 413.96081
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 7414.50365
-  tps: 4783.92678
-  hps: 354.03666
+  dps: 11386.68528
+  tps: 7526.58441
+  hps: 413.96081
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 7951.22896
-  tps: 5073.25695
-  hps: 265.35448
+  dps: 11992.64273
+  tps: 7836.30525
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Beast-tamer'sShoulders-30892"
  value: {
-  dps: 7695.79744
-  tps: 4892.00942
-  hps: 257.00534
+  dps: 11335.79773
+  tps: 7311.89928
+  hps: 302.04873
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-BlessedBattlegearofUndeadSlaying"
  value: {
-  dps: 6493.44089
-  tps: 4181.19625
-  hps: 232.68485
+  dps: 8927.6074
+  tps: 5764.46636
+  hps: 256.16032
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-BlessedGarboftheUndeadSlayer"
  value: {
-  dps: 6314.23983
-  tps: 4102.61461
-  hps: 224.48378
+  dps: 8766.27207
+  tps: 5692.23961
+  hps: 247.9175
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 6123.65682
-  tps: 3935.00522
-  hps: 224.07309
+  dps: 8511.55245
+  tps: 5489.60877
+  hps: 247.75593
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 7930.91456
-  tps: 4954.97989
-  hps: 265.35448
+  dps: 11968.24569
+  tps: 7658.41338
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Bryntroll,theBoneArbiter-50415"
  value: {
-  dps: 8006.77243
-  tps: 5125.30432
-  hps: 265.35448
+  dps: 12112.73176
+  tps: 7948.73421
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 8006.77243
-  tps: 5125.30432
-  hps: 265.35448
+  dps: 12112.73176
+  tps: 7948.73421
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 8018.14422
-  tps: 5137.09809
-  hps: 265.35448
+  dps: 12125.88471
+  tps: 7961.54708
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 363.59146
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 416.96102
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 7511.1972
-  tps: 4875.98695
-  hps: 264.40904
+  dps: 11535.91902
+  tps: 7665.49218
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 7533.71043
-  tps: 4903.0983
-  hps: 263.77874
+  dps: 11603.62037
+  tps: 7718.7299
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 7766.2444
-  tps: 4965.75993
-  hps: 265.35448
+  dps: 11759.2049
+  tps: 7731.37271
+  hps: 320.58623
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-DarkrunedBattlegear"
  value: {
-  dps: 7565.41603
-  tps: 4905.68159
-  hps: 279.46859
+  dps: 9921.10986
+  tps: 6420.7675
+  hps: 292.59093
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-DarkrunedPlate"
  value: {
-  dps: 6603.3129
-  tps: 4241.52791
-  hps: 296.98863
+  dps: 8817.13622
+  tps: 5669.75836
+  hps: 305.35065
  }
 }
 dps_results: {
- key: "TestUnholy-AllItems-Death'sChoice-47464"
+ key: "TestUnholy-AllItems-DeadlyGladiator'sSigilofStrife-42620"
  value: {
-  dps: 8251.15184
-  tps: 5289.30094
-  hps: 265.35448
+  dps: 12037.48624
+  tps: 8000.92327
+  hps: 354.2878
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 7495.87166
-  tps: 4863.42452
-  hps: 264.40904
+  dps: 11495.73922
+  tps: 7628.85609
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 7800.51844
-  tps: 5153.10702
-  hps: 272.60288
+  dps: 11888.29743
+  tps: 7959.3083
+  hps: 326.484
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 7809.43146
-  tps: 5182.73295
-  hps: 272.28773
+  dps: 11958.2821
+  tps: 8054.48519
+  hps: 325.64146
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Defender'sCode-40257"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 7953.31638
-  tps: 5075.6568
-  hps: 265.35448
+  dps: 11997.79367
+  tps: 7840.8274
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 7628.19998
-  tps: 4892.84143
-  hps: 263.46359
+  dps: 11848.51542
+  tps: 7783.12992
+  hps: 318.47988
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 7600.7134
-  tps: 4872.27609
-  hps: 262.51815
+  dps: 11780.95553
+  tps: 7717.55828
+  hps: 317.21607
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 270.31002
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 324.63789
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 265.35448
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 7951.22896
-  tps: 5073.25695
-  hps: 265.35448
+  dps: 11992.64273
+  tps: 7836.30525
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 7948.38397
-  tps: 5070.60399
-  hps: 265.35448
+  dps: 11986.19357
+  tps: 7831.29177
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 7562.36844
-  tps: 4801.365
-  hps: 266.61507
+  dps: 11771.55903
+  tps: 7692.92151
+  hps: 319.32242
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 281.53732
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 336.56382
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 265.35448
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 7556.49124
-  tps: 4919.14332
-  hps: 265.03933
+  dps: 11629.641
+  tps: 7742.60561
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 7496.8647
-  tps: 4862.25005
-  hps: 264.40904
+  dps: 11519.21216
+  tps: 7646.8729
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ForgeEmber-37660"
  value: {
-  dps: 7478.05563
-  tps: 4844.48945
-  hps: 264.40904
+  dps: 11489.8788
+  tps: 7620.66842
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 265.35448
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 265.35448
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-FuriousGladiator'sSigilofStrife-42621"
  value: {
-  dps: 8023.83031
-  tps: 5138.73815
-  hps: 265.35448
+  dps: 12055.92635
+  tps: 8015.67986
+  hps: 354.2878
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 7676.10181
-  tps: 4994.82223
-  hps: 264.40904
+  dps: 11656.35303
+  tps: 7748.75002
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-FuturesightRune-38763"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 7519.5528
-  tps: 4889.05452
-  hps: 264.72419
+  dps: 11564.39899
+  tps: 7688.281
+  hps: 320.58623
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-HatefulGladiator'sSigilofStrife-42619"
  value: {
-  dps: 7970.25378
-  tps: 5097.10913
-  hps: 265.35448
+  dps: 11999.1202
+  tps: 7969.29506
+  hps: 354.2878
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 7951.22896
-  tps: 5073.25695
-  hps: 265.35448
+  dps: 11992.64273
+  tps: 7836.30525
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 7948.38397
-  tps: 5070.60399
-  hps: 265.35448
+  dps: 11986.19357
+  tps: 7831.29177
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-IncisorFragment-37723"
  value: {
-  dps: 7579.93374
-  tps: 4919.836
-  hps: 264.40904
+  dps: 11583.58836
+  tps: 7690.60391
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 265.35448
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 7966.22794
-  tps: 5084.93125
-  hps: 278.22315
+  dps: 12005.68586
+  tps: 7844.6712
+  hps: 336.64865
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-LastWord-50179"
  value: {
-  dps: 8006.77243
-  tps: 5125.30432
-  hps: 265.35448
+  dps: 12112.73176
+  tps: 7948.73421
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-LastWord-50708"
  value: {
-  dps: 8006.77243
-  tps: 5125.30432
-  hps: 265.35448
+  dps: 12112.73176
+  tps: 7948.73421
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
+ }
+}
+dps_results: {
+ key: "TestUnholy-AllItems-MeteoriteWhetstone-37390"
+ value: {
+  dps: 11756.47038
+  tps: 7737.72528
+  hps: 316.7948
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 7503.41375
-  tps: 4877.80279
-  hps: 264.40904
+  dps: 11516.51107
+  tps: 7658.40213
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 7958.92825
-  tps: 5078.56688
-  hps: 265.35448
+  dps: 11998.5544
+  tps: 7838.96383
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 7965.5197
-  tps: 5083.85276
-  hps: 265.35448
+  dps: 12005.68586
+  tps: 7844.6712
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 269.38086
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 323.79922
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 270.31002
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 324.63789
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 7473.62595
-  tps: 4836.73617
-  hps: 264.40904
+  dps: 11495.50266
+  tps: 7623.15264
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 7482.62711
-  tps: 4844.32526
-  hps: 264.40904
+  dps: 11506.0339
+  tps: 7631.97303
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 8006.77243
-  tps: 5125.30432
-  hps: 265.35448
+  dps: 12112.73176
+  tps: 7948.73421
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-RelentlessGladiator'sSigilofStrife-42622"
  value: {
-  dps: 8043.73117
-  tps: 5154.41094
-  hps: 265.35448
+  dps: 12077.43981
+  tps: 8032.89589
+  hps: 354.2878
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 265.35448
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SavageGladiator'sSigilofStrife-42618"
  value: {
-  dps: 7964.73257
-  tps: 5092.69699
-  hps: 265.35448
+  dps: 11993.02693
+  tps: 7964.52466
+  hps: 354.2878
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ScourgeborneBattlegear"
  value: {
-  dps: 7200.89044
-  tps: 4650.13363
-  hps: 255.62308
+  dps: 9525.28507
+  tps: 6149.3073
+  hps: 273.96949
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ScourgebornePlate"
  value: {
-  dps: 6558.32811
-  tps: 4196.40212
-  hps: 270.24427
+  dps: 8729.90657
+  tps: 5583.73744
+  hps: 284.5687
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Scourgelord'sBattlegear"
  value: {
-  dps: 7951.04048
-  tps: 5295.69983
-  hps: 297.77471
+  dps: 10329.39157
+  tps: 6874.50681
+  hps: 306.02996
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Scourgelord'sPlate"
  value: {
-  dps: 7188.21334
-  tps: 4730.44798
-  hps: 308.77393
+  dps: 9392.50463
+  tps: 6184.76544
+  hps: 324.83312
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Shadowmourne-49623"
  value: {
-  dps: 8006.77243
-  tps: 5125.30432
-  hps: 265.35448
+  dps: 12112.73176
+  tps: 7948.73421
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SigilofDeflection-45144"
  value: {
-  dps: 7921.48303
-  tps: 5058.1352
-  hps: 265.35448
+  dps: 11945.28569
+  tps: 7927.14031
+  hps: 354.2878
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SigilofHauntedDreams-40715"
  value: {
-  dps: 7931.17487
-  tps: 5068.53106
-  hps: 265.35448
+  dps: 11961.85428
+  tps: 7943.7019
+  hps: 354.2878
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SigilofInsolence-47672"
  value: {
-  dps: 7921.48303
-  tps: 5058.1352
-  hps: 265.35448
- }
-}
-dps_results: {
- key: "TestUnholy-AllItems-SigilofVirulence-47673"
- value: {
-  dps: 8125.37063
-  tps: 5150.58475
-  hps: 238.25177
+  dps: 11945.28569
+  tps: 7927.14031
+  hps: 354.2878
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SigiloftheBoneGryphon-50462"
  value: {
-  dps: 7921.48303
-  tps: 5058.1352
-  hps: 265.35448
+  dps: 11945.28569
+  tps: 7927.14031
+  hps: 354.2878
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SigiloftheHangedMan-50459"
  value: {
-  dps: 7921.48303
-  tps: 5058.1352
-  hps: 265.35448
+  dps: 11945.28569
+  tps: 7927.14031
+  hps: 354.2878
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SigiloftheUnfalteringKnight-40714"
  value: {
-  dps: 7921.48303
-  tps: 5058.1352
-  hps: 265.35448
+  dps: 11945.28569
+  tps: 7927.14031
+  hps: 354.2878
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 299.59146
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 352.96102
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SoulPreserver-37111"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SouloftheDead-40382"
  value: {
-  dps: 7499.17266
-  tps: 4864.64157
-  hps: 264.40904
+  dps: 11524.96312
+  tps: 7653.10611
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SparkofLife-37657"
  value: {
-  dps: 7496.50604
-  tps: 4817.36718
-  hps: 265.66963
+  dps: 11587.29884
+  tps: 7621.79593
+  hps: 315.10972
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 7616.43586
-  tps: 4892.2014
-  hps: 264.72419
+  dps: 11634.70386
+  tps: 7681.43189
+  hps: 321.85004
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-StormshroudArmor"
  value: {
-  dps: 6004.47243
-  tps: 3885.85546
-  hps: 204.81996
+  dps: 8381.14072
+  tps: 5450.54168
+  hps: 226.05362
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 7965.5197
-  tps: 5083.85276
-  hps: 265.35448
+  dps: 12005.68586
+  tps: 7844.6712
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 7958.92825
-  tps: 5078.56688
-  hps: 265.35448
+  dps: 11998.5544
+  tps: 7838.96383
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 7947.3932
-  tps: 5069.31661
-  hps: 265.35448
+  dps: 11986.07434
+  tps: 7828.97594
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Thassarian'sBattlegear"
  value: {
-  dps: 7743.81167
-  tps: 5066.62197
-  hps: 277.93737
+  dps: 10132.10034
+  tps: 6625.10476
+  hps: 290.54436
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Thassarian'sPlate"
  value: {
-  dps: 6705.12504
-  tps: 4279.81442
-  hps: 289.52451
+  dps: 8863.96906
+  tps: 5668.38989
+  hps: 301.49008
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 7398.49233
-  tps: 4697.9724
-  hps: 251.95663
+  dps: 10591.53851
+  tps: 6873.44705
+  hps: 304.38433
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 7975.91081
-  tps: 5072.09354
-  hps: 263.46359
+  dps: 12098.22146
+  tps: 7891.53916
+  hps: 320.58623
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 7597.78763
-  tps: 4925.19714
-  hps: 267.87566
+  dps: 11720.57679
+  tps: 7791.88575
+  hps: 321.85004
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 7601.95232
-  tps: 4941.83932
-  hps: 264.72419
+  dps: 11730.62277
+  tps: 7805.13668
+  hps: 314.68845
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 265.35448
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 265.35448
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 7501.70717
-  tps: 4803.83275
-  hps: 263.46359
+  dps: 11559.75027
+  tps: 7586.19243
+  hps: 315.53099
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 265.35448
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 7930.91456
-  tps: 5056.10193
-  hps: 265.35448
+  dps: 11968.24569
+  tps: 7814.70753
+  hps: 320.16496
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-UndeadSlayer'sBlessedArmor"
  value: {
-  dps: 6347.51923
-  tps: 4132.10568
-  hps: 230.2196
+  dps: 8765.34774
+  tps: 5684.52231
+  hps: 250.27985
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 7664.45769
-  tps: 4885.16685
-  hps: 264.74695
+  dps: 11393.27428
+  tps: 7398.50065
+  hps: 322.61266
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-WingedTalisman-37844"
  value: {
-  dps: 7414.53871
-  tps: 4783.96014
-  hps: 264.40904
+  dps: 11386.53943
+  tps: 7526.45852
+  hps: 321.0075
  }
 }
 dps_results: {
  key: "TestUnholy-AllItems-WrathfulGladiator'sSigilofStrife-51417"
  value: {
-  dps: 8066.47501
-  tps: 5172.32271
-  hps: 265.35448
+  dps: 12102.02662
+  tps: 8052.57135
+  hps: 354.2878
  }
 }
 dps_results: {
  key: "TestUnholy-Average-Default"
  value: {
-  dps: 7991.59054
-  tps: 5126.22255
-  hps: 265.34082
- }
-}
-dps_results: {
- key: "TestUnholy-Settings-Human-Unholy P1 -Basic--FullBuffs-LongMultiTarget"
- value: {
-  dps: 35968.66383
-  tps: 38412.81137
-  hps: 261.42005
- }
-}
-dps_results: {
- key: "TestUnholy-Settings-Human-Unholy P1 -Basic--FullBuffs-LongSingleTarget"
- value: {
-  dps: 7795.72355
-  tps: 5091.66639
-  hps: 264.56969
- }
-}
-dps_results: {
- key: "TestUnholy-Settings-Human-Unholy P1 -Basic--FullBuffs-ShortSingleTarget"
- value: {
-  dps: 11135.48033
-  tps: 5602.22236
-  hps: 231.49848
- }
-}
-dps_results: {
- key: "TestUnholy-Settings-Human-Unholy P1 -Basic--NoBuffs-LongMultiTarget"
- value: {
-  dps: 21706.5507
-  tps: 23841.66091
-  hps: 158.16236
- }
-}
-dps_results: {
- key: "TestUnholy-Settings-Human-Unholy P1 -Basic--NoBuffs-LongSingleTarget"
- value: {
-  dps: 3835.52191
-  tps: 2760.15078
-  hps: 159.48827
- }
-}
-dps_results: {
- key: "TestUnholy-Settings-Human-Unholy P1 -Basic--NoBuffs-ShortSingleTarget"
- value: {
-  dps: 4846.79478
-  tps: 2809.23478
-  hps: 142.062
- }
-}
-dps_results: {
- key: "TestUnholy-Settings-Human-Unholy P2-Basic--FullBuffs-LongMultiTarget"
- value: {
-  dps: 46291.21235
-  tps: 49648.92161
-  hps: 320.4671
- }
-}
-dps_results: {
- key: "TestUnholy-Settings-Human-Unholy P2-Basic--FullBuffs-LongSingleTarget"
- value: {
-  dps: 10221.03637
-  tps: 6801.01813
-  hps: 327.90162
- }
-}
-dps_results: {
- key: "TestUnholy-Settings-Human-Unholy P2-Basic--FullBuffs-ShortSingleTarget"
- value: {
-  dps: 14242.17848
-  tps: 7485.03166
-  hps: 283.68577
- }
-}
-dps_results: {
- key: "TestUnholy-Settings-Human-Unholy P2-Basic--NoBuffs-LongMultiTarget"
- value: {
-  dps: 29118.81955
-  tps: 32086.26534
-  hps: 210.32917
- }
-}
-dps_results: {
- key: "TestUnholy-Settings-Human-Unholy P2-Basic--NoBuffs-LongSingleTarget"
- value: {
-  dps: 5249.22907
-  tps: 3856.35123
-  hps: 211.33915
- }
-}
-dps_results: {
- key: "TestUnholy-Settings-Human-Unholy P2-Basic--NoBuffs-ShortSingleTarget"
- value: {
-  dps: 6451.53316
-  tps: 3919.85304
-  hps: 180.53464
+  dps: 12083.63019
+  tps: 7959.79518
+  hps: 318.97184
  }
 }
 dps_results: {
- key: "TestUnholy-Settings-Orc-Unholy P1 -Basic--FullBuffs-LongMultiTarget"
+ key: "TestUnholy-Settings-Human-Unholy P3 -Basic--FullBuffs-LongMultiTarget"
  value: {
-  dps: 36548.78089
-  tps: 38910.76625
-  hps: 261.88786
+  dps: 58105.82701
+  tps: 60796.79416
+  hps: 318.76192
  }
 }
 dps_results: {
- key: "TestUnholy-Settings-Orc-Unholy P1 -Basic--FullBuffs-LongSingleTarget"
+ key: "TestUnholy-Settings-Human-Unholy P3 -Basic--FullBuffs-LongSingleTarget"
  value: {
-  dps: 8006.77243
-  tps: 5125.30432
-  hps: 265.35448
+  dps: 11898.31908
+  tps: 7928.48366
+  hps: 317.91975
  }
 }
 dps_results: {
- key: "TestUnholy-Settings-Orc-Unholy P1 -Basic--FullBuffs-ShortSingleTarget"
+ key: "TestUnholy-Settings-Human-Unholy P3 -Basic--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 11518.6172
-  tps: 5661.83175
-  hps: 231.63366
+  dps: 16848.79039
+  tps: 8795.40056
+  hps: 216.85917
  }
 }
 dps_results: {
- key: "TestUnholy-Settings-Orc-Unholy P1 -Basic--NoBuffs-LongMultiTarget"
+ key: "TestUnholy-Settings-Human-Unholy P3 -Basic--NoBuffs-LongMultiTarget"
  value: {
-  dps: 21915.68581
-  tps: 24027.33152
-  hps: 158.09971
+  dps: 35204.04887
+  tps: 37758.02393
+  hps: 207.00864
  }
 }
 dps_results: {
- key: "TestUnholy-Settings-Orc-Unholy P1 -Basic--NoBuffs-LongSingleTarget"
+ key: "TestUnholy-Settings-Human-Unholy P3 -Basic--NoBuffs-LongSingleTarget"
  value: {
-  dps: 3912.26789
-  tps: 2776.45458
-  hps: 160.37453
+  dps: 6085.94017
+  tps: 4441.00825
+  hps: 207.00864
  }
 }
 dps_results: {
- key: "TestUnholy-Settings-Orc-Unholy P1 -Basic--NoBuffs-ShortSingleTarget"
+ key: "TestUnholy-Settings-Human-Unholy P3 -Basic--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 5018.19277
-  tps: 2845.68176
-  hps: 142.176
+  dps: 7612.51401
+  tps: 4527.00365
+  hps: 149.6448
  }
 }
 dps_results: {
- key: "TestUnholy-Settings-Orc-Unholy P2-Basic--FullBuffs-LongMultiTarget"
+ key: "TestUnholy-Settings-Orc-Unholy P3 -Basic--FullBuffs-LongMultiTarget"
  value: {
-  dps: 46366.97977
-  tps: 49427.73421
-  hps: 321.79215
+  dps: 58738.90776
+  tps: 61349.01007
+  hps: 322.27131
  }
 }
 dps_results: {
- key: "TestUnholy-Settings-Orc-Unholy P2-Basic--FullBuffs-LongSingleTarget"
+ key: "TestUnholy-Settings-Orc-Unholy P3 -Basic--FullBuffs-LongSingleTarget"
  value: {
-  dps: 10365.93895
-  tps: 6769.32612
-  hps: 327.66427
+  dps: 12112.73176
+  tps: 7948.73421
+  hps: 320.16496
  }
 }
 dps_results: {
- key: "TestUnholy-Settings-Orc-Unholy P2-Basic--FullBuffs-ShortSingleTarget"
+ key: "TestUnholy-Settings-Orc-Unholy P3 -Basic--FullBuffs-ShortSingleTarget"
  value: {
-  dps: 14696.47552
-  tps: 7548.85246
-  hps: 279.90437
+  dps: 17254.6897
+  tps: 8835.04558
+  hps: 216.95389
  }
 }
 dps_results: {
- key: "TestUnholy-Settings-Orc-Unholy P2-Basic--NoBuffs-LongMultiTarget"
+ key: "TestUnholy-Settings-Orc-Unholy P3 -Basic--NoBuffs-LongMultiTarget"
  value: {
-  dps: 29221.09804
-  tps: 32151.90593
-  hps: 209.69784
+  dps: 35571.33886
+  tps: 38148.06637
+  hps: 206.56764
  }
 }
 dps_results: {
- key: "TestUnholy-Settings-Orc-Unholy P2-Basic--NoBuffs-LongSingleTarget"
+ key: "TestUnholy-Settings-Orc-Unholy P3 -Basic--NoBuffs-LongSingleTarget"
  value: {
-  dps: 5333.2494
-  tps: 3859.94006
-  hps: 211.97167
+  dps: 6185.87601
+  tps: 4451.17036
+  hps: 208.78582
  }
 }
 dps_results: {
- key: "TestUnholy-Settings-Orc-Unholy P2-Basic--NoBuffs-ShortSingleTarget"
+ key: "TestUnholy-Settings-Orc-Unholy P3 -Basic--NoBuffs-ShortSingleTarget"
  value: {
-  dps: 6613.79953
-  tps: 3921.00791
-  hps: 175.59036
+  dps: 7822.66151
+  tps: 4553.96745
+  hps: 153.88596
  }
 }
 dps_results: {
  key: "TestUnholy-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 7671.25947
-  tps: 4982.74458
-  hps: 262.8333
+  dps: 11620.29838
+  tps: 7666.00758
+  hps: 315.53099
  }
 }
diff --git a/sim/deathknight/dps/dps_deathknight_test.go b/sim/deathknight/dps/dps_deathknight_test.go
index 82f5ab020d..73f176fc6d 100644
--- a/sim/deathknight/dps/dps_deathknight_test.go
+++ b/sim/deathknight/dps/dps_deathknight_test.go
@@ -18,7 +18,7 @@ func TestBlood(t *testing.T) {
 		Race:       proto.Race_RaceOrc,
 		OtherRaces: []proto.Race{proto.Race_RaceHuman},
 
-		GearSet:     core.GearSetCombo{Label: "Blood P1 ", GearSet: BloodP1Gear},
+		GearSet:     core.GearSetCombo{Label: "Blood P3 ", GearSet: BloodP3Gear},
 		Talents:     BloodTalents,
 		Glyphs:      BloodDefaultGlyphs,
 		Consumes:    FullConsumes,
@@ -42,10 +42,7 @@ func TestUnholy(t *testing.T) {
 		Race:       proto.Race_RaceOrc,
 		OtherRaces: []proto.Race{proto.Race_RaceHuman},
 
-		GearSet: core.GearSetCombo{Label: "Unholy P1 ", GearSet: UnholyDwP1Gear},
-		OtherGearSets: []core.GearSetCombo{
-			{Label: "Unholy P2", GearSet: UnholyDwP2Gear},
-		},
+		GearSet:     core.GearSetCombo{Label: "Unholy P3 ", GearSet: UnholyDwP3Gear},
 		Talents:     UnholyTalents,
 		Glyphs:      UnholyDefaultGlyphs,
 		Consumes:    FullConsumes,
@@ -69,10 +66,7 @@ func TestFrost(t *testing.T) {
 		Race:       proto.Race_RaceOrc,
 		OtherRaces: []proto.Race{proto.Race_RaceHuman},
 
-		GearSet: core.GearSetCombo{Label: "Frost P1", GearSet: FrostP1Gear},
-		OtherGearSets: []core.GearSetCombo{
-			{Label: "Frost P2", GearSet: FrostP2Gear},
-		},
+		GearSet:     core.GearSetCombo{Label: "Frost P3", GearSet: FrostP3Gear},
 		Talents:     FrostTalents,
 		Glyphs:      FrostDefaultGlyphs,
 		Consumes:    FullConsumes,
@@ -99,10 +93,7 @@ func TestFrostUH(t *testing.T) {
 		Race:       proto.Race_RaceOrc,
 		OtherRaces: []proto.Race{proto.Race_RaceHuman},
 
-		GearSet: core.GearSetCombo{Label: "Frost P1", GearSet: FrostP1Gear},
-		OtherGearSets: []core.GearSetCombo{
-			{Label: "Frost P2", GearSet: FrostP2Gear},
-		},
+		GearSet:     core.GearSetCombo{Label: "Frost P1", GearSet: FrostP3Gear},
 		Talents:     FrostUHTalents,
 		Glyphs:      FrostUHDefaultGlyphs,
 		Consumes:    FullConsumes,
@@ -230,503 +221,62 @@ var FullConsumes = &proto.Consumes{
 	Food:          proto.Food_FoodDragonfinFilet,
 }
 
-var BloodP1Gear = core.EquipmentSpecFromJsonString(`{"items": [
-	{
-		"id": 44006,
-		"enchant": 3817,
-		"gems": [
-		  41398,
-		  42702
-		]
-	  },
-	  {
-		"id": 44664,
-		"gems": [
-		  39996
-		]
-	  },
-	  {
-		"id": 40557,
-		"enchant": 3808,
-		"gems": [
-		  39996
-		]
-	  },
-	  {
-		"id": 40403,
-		"enchant": 3831
-	  },
-	  {
-		"id": 40550,
-		"enchant": 3832,
-		"gems": [
-		  42142,
-		  42142
-		]
-	  },
-	  {
-		"id": 40330,
-		"enchant": 3845,
-		"gems": [
-		  42142,
-		  0
-		]
-	  },
-	  {
-		"id": 40552,
-		"enchant": 3604,
-		"gems": [
-		  39996,
-		  0
-		]
-	  },
-	  {
-		"id": 40317,
-		"gems": [
-		  39996
-		]
-	  },
-	  {
-		"id": 40556,
-		"enchant": 3823,
-		"gems": [
-		  39996,
-		  39996
-		]
-	  },
-	  {
-		"id": 40591,
-		"enchant": 3606
-	  },
-	  {
-		"id": 40075
-	  },
-	  {
-		"id": 39401
-	  },
-	  {
-		"id": 40256
-	  },
-	  {
-		"id": 42987
-	  },
-	  {
-		"id": 40384,
-		"enchant": 3368
-	  },
-	  {},
-	  {
-		"id": 40207
-	  }
+var BloodP3Gear = core.EquipmentSpecFromJsonString(`{"items": [
+		  {"id":48493,"enchant":3817,"gems":[41285,40142]},
+		  {"id":47458,"gems":[40142]},
+		  {"id":48495,"enchant":3808,"gems":[40111]},
+		  {"id":47546,"enchant":3831,"gems":[42142]},
+		  {"id":47449,"enchant":3832,"gems":[49110,42142,40142]},
+		  {"id":48008,"enchant":3845,"gems":[40111,0]},
+		  {"id":48492,"enchant":3604,"gems":[40142,0]},
+		  {"id":47429,"gems":[40142,40142,40111]},
+		  {"id":48494,"enchant":3823,"gems":[40142,40111]},
+		  {"id":45599,"enchant":3606,"gems":[40111,40111]},
+		  {"id":47993,"gems":[40111,45862]},
+		  {"id":47413,"gems":[40142]},
+		  {"id":45931},
+		  {"id":47464},
+		  {"id":47446,"enchant":3368,"gems":[42142,40141]},
+		  {},
+		  {"id":47673}
 ]}`)
 
-var UnholyDwP1Gear = core.EquipmentSpecFromJsonString(`{"items": [
-	{
-		"id": 44006,
-		"enchant": 3817,
-		"gems": [
-			41398,
-			42702
-		]
-	},
-	{
-		"id": 39421
-	},
-	{
-		"id": 40557,
-		"enchant": 3808,
-		"gems": [
-			39996
-		]
-	},
-	{
-		"id": 40403,
-		"enchant": 3831
-	},
-	{
-		"id": 40550,
-		"enchant": 3832,
-		"gems": [
-			42142,
-			39996
-		]
-	},
-	{
-		"id": 40330,
-		"enchant": 3845,
-		"gems": [
-			39996,
-			0
-		]
-	},
-	{
-		"id": 40347,
-		"enchant": 3604,
-		"gems": [
-			39996,
-			0
-		]
-	},
-	{
-		"id": 40278,
-		"gems": [
-			42142,
-			42142
-		]
-	},
-	{
-		"id": 40294,
-		"enchant": 3823
-	},
-	{
-		"id": 39706,
-		"enchant": 3606,
-		"gems": [
-			39996
-		]
-	},
-	{
-		"id": 39401
-	},
-	{
-		"id": 40075
-	},
-	{
-		"id": 37390
-	},
-	{
-		"id": 42987
-	},
-	{
-		"id": 40402,
-		"enchant": 3368
-	},
-	{
-		"id": 40491,
-		"enchant": 3368
-	},
-	{
-		"id": 42620
-	}
+var UnholyDwP3Gear = core.EquipmentSpecFromJsonString(`{"items": [
+		{"id":48493,"enchant":3817,"gems":[41398,40146]},
+		  {"id":47458,"gems":[40146]},
+		  {"id":48495,"enchant":3808,"gems":[40111]},
+		  {"id":47548,"enchant":3831,"gems":[40111]},
+		  {"id":48491,"enchant":3832,"gems":[42142,42142]},
+		  {"id":45663,"enchant":3845,"gems":[40111,0]},
+		  {"id":48492,"enchant":3604,"gems":[40146,0]},
+		  {"id":47429,"gems":[40111,45862,40111]},
+		  {"id":47465,"enchant":3823,"gems":[49110,40111,40146]},
+		  {"id":45599,"enchant":3606,"gems":[40111,40111]},
+		  {"id":47413,"gems":[40146]},
+		  {"id":45534,"gems":[42142]},
+		  {"id":47464},
+		  {"id":45609},
+		  {"id":47528,"enchant":3368,"gems":[40111]},
+		  {"id":47528,"enchant":3368,"gems":[40111]},
+		  {"id":47673}
 ]}`)
 
-var UnholyDwP2Gear = core.EquipmentSpecFromJsonString(`{"items": [
-	{
-	  "id": 45472,
-	  "enchant": 3817,
-	  "gems": [
-		41398,
-		40041
-	  ]
-	},
-	{
-	  "id": 46040,
-	  "gems": [
-		39996
-	  ]
-	},
-	{
-	  "id": 46117,
-	  "enchant": 3808,
-	  "gems": [
-		39996
-	  ]
-	},
-	{
-	  "id": 45588,
-	  "enchant": 3831,
-	  "gems": [
-		39996
-	  ]
-	},
-	{
-	  "id": 46111,
-	  "enchant": 3832,
-	  "gems": [
-		42142,
-		42142
-	  ]
-	},
-	{
-	  "id": 45663,
-	  "enchant": 3845,
-	  "gems": [
-		39996,
-		0
-	  ]
-	},
-	{
-	  "id": 45481,
-	  "enchant": 3604,
-	  "gems": [
-		0
-	  ]
-	},
-	{
-	  "id": 45241,
-	  "gems": [
-		42142,
-		45862,
-		39996
-	  ]
-	},
-	{
-	  "id": 45134,
-	  "enchant": 3823,
-	  "gems": [
-		40041,
-		39996,
-		40022
-	  ]
-	},
-	{
-	  "id": 45599,
-	  "enchant": 3606,
-	  "gems": [
-		39996,
-		39996
-	  ]
-	},
-	{
-	  "id": 45534,
-	  "gems": [
-		39996
-	  ]
-	},
-	{
-	  "id": 45250
-	},
-	{
-	  "id": 45609
-	},
-	{
-	  "id": 42987
-	},
-	{
-	  "id": 46097,
-	  "enchant": 3368,
-	  "gems": [
-		39996
-	  ]
-	},
-	{
-	  "id": 46036,
-	  "enchant": 3368,
-	  "gems": [
-		39996
-	  ]
-	},
-	{
-	  "id": 45254
-	}
-]}`)
-
-var FrostP1Gear = core.EquipmentSpecFromJsonString(`{ "items": [
-	{
-		"id": 44006,
-		"enchant": 3817,
-		"gems": [
-			41398,
-			42702
-		]
-	},
-	{
-		"id": 44664,
-		"gems": [
-			39996
-		]
-	},
-	{
-		"id": 40557,
-		"enchant": 3808,
-		"gems": [
-			39996
-		]
-	},
-	{
-		"id": 40403,
-		"enchant": 3831
-	},
-	{
-		"id": 40550,
-		"enchant": 3832,
-		"gems": [
-			42142,
-			39996
-		]
-	},
-	{
-		"id": 40330,
-		"enchant": 3845,
-		"gems": [
-			39996,
-			0
-		]
-	},
-	{
-		"id": 40552,
-		"enchant": 3604,
-		"gems": [
-			39996,
-			0
-		]
-	},
-	{
-		"id": 40278,
-		"gems": [
-			39996,
-			42142
-		]
-	},
-	{
-		"id": 40556,
-		"enchant": 3823,
-		"gems": [
-			42142,
-			39996
-		]
-	},
-	{
-		"id": 40591,
-		"enchant": 3606
-	},
-	{
-		"id": 39401
-	},
-	{
-		"id": 40075
-	},
-	{
-		"id": 40256
-	},
-	{
-		"id": 42987
-	},
-	{
-		"id": 40189,
-		"enchant": 3370
-	},
-	{
-		"id": 40189,
-		"enchant": 3368
-	},
-	{
-		"id": 40207
-	}
-]}`)
-
-var FrostP2Gear = core.EquipmentSpecFromJsonString(`{ "items": [
-	{
-	  "id": 46115,
-	  "enchant": 3817,
-	  "gems": [
-		41398,
-		42702
-	  ]
-	},
-	{
-	  "id": 45459,
-	  "gems": [
-		39996
-	  ]
-	},
-	{
-	  "id": 46117,
-	  "enchant": 3808,
-	  "gems": [
-		39996
-	  ]
-	},
-	{
-	  "id": 46032,
-	  "enchant": 3831,
-	  "gems": [
-		39996,
-		39996
-	  ]
-	},
-	{
-	  "id": 46111,
-	  "enchant": 3832,
-	  "gems": [
-		42142,
-		42142
-	  ]
-	},
-	{
-	  "id": 45663,
-	  "enchant": 3845,
-	  "gems": [
-		39996,
-		0
-	  ]
-	},
-	{
-	  "id": 46113,
-	  "enchant": 3604,
-	  "gems": [
-		39996,
-		0
-	  ]
-	},
-	{
-	  "id": 45241,
-	  "gems": [
-		42142,
-		45862,
-		39996
-	  ]
-	},
-	{
-	  "id": 45134,
-	  "enchant": 3823,
-	  "gems": [
-		39996,
-		39996,
-		39996
-	  ]
-	},
-	{
-	  "id": 45599,
-	  "enchant": 3606,
-	  "gems": [
-		39996,
-		39996
-	  ]
-	},
-	{
-	  "id": 45608,
-	  "gems": [
-		39996
-	  ]
-	},
-	{
-	  "id": 45534,
-	  "gems": [
-		39996
-	  ]
-	},
-	{
-	  "id": 45931
-	},
-	{
-	  "id": 42987
-	},
-	{
-	  "id": 46097,
-	  "enchant": 3370,
-	  "gems": [
-		39996
-	  ]
-	},
-	{
-	  "id": 46097,
-	  "enchant": 3368,
-	  "gems": [
-		39996
-	  ]
-	},
-	{
-	  "id": 40207
-	}
+var FrostP3Gear = core.EquipmentSpecFromJsonString(`{ "items": [
+		{"id":48493,"enchant":3817,"gems":[41398,40142]},
+		  {"id":45459,"gems":[40111]},
+		  {"id":48495,"enchant":3808,"gems":[40111]},
+		  {"id":47548,"enchant":3831,"gems":[40111]},
+		  {"id":48491,"enchant":3832,"gems":[42142,42142]},
+		  {"id":45663,"enchant":3845,"gems":[40111,0]},
+		  {"id":47492,"enchant":3604,"gems":[49110,40111,0]},
+		  {"id":45241,"gems":[40111,42142,40111]},
+		  {"id":48494,"enchant":3823,"gems":[40142,40111]},
+		  {"id":47473,"enchant":3606,"gems":[40142,40111]},
+		  {"id":46966,"gems":[40111]},
+		  {"id":45534,"gems":[40111]},
+		  {"id":47464},
+		  {"id":45931},
+		  {"id":47528,"enchant":3370,"gems":[40111]},
+		  {"id":47528,"enchant":3368,"gems":[40111]},
+		  {"id":40207}
 ]}`)
diff --git a/sim/mage/TestArcane.results b/sim/mage/TestArcane.results
index 98823ddd6b..5b190aef62 100644
--- a/sim/mage/TestArcane.results
+++ b/sim/mage/TestArcane.results
@@ -3,25 +3,25 @@ character_stats_results: {
  value: {
   final_stats: 303.6
   final_stats: 312.4
-  final_stats: 1341.45
-  final_stats: 1388.97
-  final_stats: 824.01
-  final_stats: 2951.3455
+  final_stats: 1976.15
+  final_stats: 2175.8
+  final_stats: 592.9
+  final_stats: 4506.37
   final_stats: 109
   final_stats: 295.69598
-  final_stats: 1606.6853
-  final_stats: 609
+  final_stats: 2429.29605
+  final_stats: 1238
   final_stats: 0
   final_stats: 755.7
   final_stats: 217
-  final_stats: 750.08921
-  final_stats: 609
+  final_stats: 1483.08921
+  final_stats: 1238
   final_stats: 0
   final_stats: 0
-  final_stats: 23822.55
+  final_stats: 35625
   final_stats: 0
   final_stats: 0
-  final_stats: 5420.3
+  final_stats: 5794.3
   final_stats: 755.7
   final_stats: 0
   final_stats: 0
@@ -29,7 +29,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 20197.5
+  final_stats: 26544.5
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -46,815 +46,808 @@ character_stats_results: {
 dps_results: {
  key: "TestArcane-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 6698.76765
-  tps: 4029.52651
+  dps: 12834.19111
+  tps: 7816.05923
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 6730.8376
-  tps: 4048.44966
+  dps: 12878.93285
+  tps: 7842.54498
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 6643.37894
-  tps: 3995.0823
+  dps: 12752.26959
+  tps: 7770.30597
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 6430.50554
-  tps: 3871.08923
-  hps: 96.73456
+  dps: 12475.10226
+  tps: 7605.11222
+  hps: 103.16878
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 6430.50554
-  tps: 3871.08923
-  hps: 96.73456
+  dps: 12475.10226
+  tps: 7605.11222
+  hps: 103.16878
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 6696.6482
-  tps: 4027.14945
+  dps: 12851.70002
+  tps: 7828.25874
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 5490.67714
-  tps: 3306.64817
+  dps: 8535.12891
+  tps: 5214.00042
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Bloodmage'sRegalia"
  value: {
-  dps: 7308.71366
-  tps: 4398.33297
+  dps: 11069.59239
+  tps: 6760.62376
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 6679.85653
-  tps: 3937.85366
+  dps: 12802.2088
+  tps: 7645.85546
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 6816.294
-  tps: 4098.7158
+  dps: 13162.2539
+  tps: 8018.98262
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
   hps: 64
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 6527.37599
-  tps: 3928.91099
+  dps: 12610.48567
+  tps: 7684.11469
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 6538.76082
-  tps: 3959.58833
+  dps: 12632.31064
+  tps: 7723.25529
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 6654.73893
-  tps: 4007.14476
+  dps: 12763.6108
+  tps: 7778.916
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Death'sChoice-47464"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 6462.6466
-  tps: 3890.29137
+  dps: 12513.28757
+  tps: 7626.31093
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Defender'sCode-40257"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 6658.75442
-  tps: 4004.19205
- }
-}
-dps_results: {
- key: "TestArcane-AllItems-DislodgedForeignObject-50348"
- value: {
-  dps: 6924.10856
-  tps: 4170.35899
+  dps: 12791.24628
+  tps: 7793.93262
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 6882.68281
-  tps: 4145.64387
+  dps: 13108.32179
+  tps: 7989.83102
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 6643.37894
-  tps: 3995.0823
+  dps: 12752.26959
+  tps: 7770.30597
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 6734.04169
-  tps: 4049.06622
+  dps: 12896.0634
+  tps: 7853.88794
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 6656.81718
-  tps: 4003.02971
+  dps: 12786.32094
+  tps: 7790.88024
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 6655.92028
-  tps: 4002.49156
+  dps: 12768.34301
+  tps: 7780.13023
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 6569.74942
-  tps: 3957.23052
+  dps: 12704.9781
+  tps: 7751.23777
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 6643.37894
-  tps: 3995.0823
+  dps: 12752.26959
+  tps: 7770.30597
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 6521.74451
-  tps: 3925.36126
+  dps: 12616.54492
+  tps: 7688.3552
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6706.92539
-  tps: 4035.54118
+  dps: 12874.24648
+  tps: 7841.58289
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 6536.65072
-  tps: 3934.72941
+  dps: 12582.40651
+  tps: 7669.66287
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 6599.64238
-  tps: 3971.03678
+  dps: 12695.89845
+  tps: 7734.19419
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6616.31647
-  tps: 3981.86963
+  dps: 12761.83017
+  tps: 7774.3017
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 6679.85653
-  tps: 4016.59356
+  dps: 12802.2088
+  tps: 7799.86184
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 6672.56101
-  tps: 4012.2913
+  dps: 12792.22095
+  tps: 7793.95066
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-FrostfireGarb"
  value: {
-  dps: 6174.04621
-  tps: 3716.34332
+  dps: 8983.93795
+  tps: 5474.53088
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6571.31223
-  tps: 3953.92109
+  dps: 12705.68354
+  tps: 7741.51542
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Gladiator'sRegalia"
  value: {
-  dps: 6580.93595
-  tps: 3953.67777
+  dps: 9377.4157
+  tps: 5713.6332
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 6714.80263
-  tps: 4038.98808
+  dps: 12856.56198
+  tps: 7829.30211
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 6751.24574
-  tps: 4060.49166
+  dps: 12907.40487
+  tps: 7859.39955
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 6519.62737
-  tps: 3941.50052
+  dps: 12632.07148
+  tps: 7716.26469
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Heartpierce-49982"
  value: {
-  dps: 6816.294
-  tps: 4098.7158
+  dps: 13162.2539
+  tps: 8018.98262
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Heartpierce-50641"
  value: {
-  dps: 6816.294
-  tps: 4098.7158
+  dps: 13162.2539
+  tps: 8018.98262
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6717.42882
-  tps: 4041.84825
+  dps: 12861.70933
+  tps: 7833.88763
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 6656.81718
-  tps: 4003.02971
+  dps: 12786.32094
+  tps: 7790.88024
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 6655.92028
-  tps: 4002.49156
+  dps: 12768.34301
+  tps: 7780.13023
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-IncisorFragment-37723"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 6728.89615
-  tps: 4050.27988
+  dps: 12870.09652
+  tps: 7839.8163
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 6643.37894
-  tps: 3995.0823
+  dps: 12752.26959
+  tps: 7770.30597
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Khadgar'sRegalia"
  value: {
-  dps: 6618.7486
-  tps: 3976.40269
+  dps: 9742.42343
+  tps: 5941.19216
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-KirinTorGarb"
  value: {
-  dps: 6487.10482
-  tps: 3894.90303
+  dps: 9507.59434
+  tps: 5789.31499
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6599.74627
-  tps: 3969.91839
+  dps: 12754.65653
+  tps: 7769.98862
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 6499.70754
-  tps: 3912.31367
+  dps: 12584.07392
+  tps: 7668.48606
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 6655.55803
-  tps: 4004.58617
+  dps: 12760.37361
+  tps: 7773.85288
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Nibelung-49992"
  value: {
-  dps: 6816.294
-  tps: 4098.7158
+  dps: 13162.2539
+  tps: 8018.98262
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Nibelung-50648"
  value: {
-  dps: 6816.294
-  tps: 4098.7158
+  dps: 13162.2539
+  tps: 8018.98262
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 6643.37894
-  tps: 3995.0823
+  dps: 12752.26959
+  tps: 7770.30597
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 6643.37894
-  tps: 3995.0823
+  dps: 12752.26959
+  tps: 7770.30597
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 6643.37894
-  tps: 3995.0823
+  dps: 12752.26959
+  tps: 7770.30597
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 6643.37894
-  tps: 3995.0823
+  dps: 12752.26959
+  tps: 7770.30597
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6858.42156
-  tps: 4200.18553
+  dps: 13073.00127
+  tps: 8078.65948
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6907.45424
-  tps: 4238.43161
+  dps: 13145.11995
+  tps: 8135.8376
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 6801.66365
-  tps: 4090.05312
+  dps: 13125.03292
+  tps: 7996.50934
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 6657.24719
-  tps: 4002.85503
+  dps: 12806.12513
+  tps: 7800.18034
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 6715.85788
-  tps: 4040.91483
+  dps: 12845.98173
+  tps: 7826.90298
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 6725.34016
-  tps: 4047.42885
+  dps: 12892.50114
+  tps: 7855.57613
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SoulPreserver-37111"
  value: {
-  dps: 6547.16429
-  tps: 3940.07162
+  dps: 12622.68469
+  tps: 7690.85387
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SouloftheDead-40382"
  value: {
-  dps: 6593.68358
-  tps: 3973.63515
+  dps: 12702.00539
+  tps: 7743.42935
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SparkofLife-37657"
  value: {
-  dps: 6533.0847
-  tps: 3933.08129
+  dps: 12637.87261
+  tps: 7695.97438
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 6606.42671
-  tps: 3976.08377
+  dps: 12481.77869
+  tps: 7608.43508
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 6643.37894
-  tps: 3995.0823
+  dps: 12752.26959
+  tps: 7770.30597
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 6643.37894
-  tps: 3995.0823
+  dps: 12752.26959
+  tps: 7770.30597
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 6643.37894
-  tps: 3995.0823
+  dps: 12752.26959
+  tps: 7770.30597
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 6492.55815
-  tps: 3907.19073
+  dps: 12591.22803
+  tps: 7670.77487
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 6555.79324
-  tps: 3947.32368
+  dps: 12617.97245
+  tps: 7690.89947
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TempestRegalia"
  value: {
-  dps: 5121.99228
-  tps: 3093.62052
+  dps: 6987.03183
+  tps: 4286.78086
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 6437.83494
-  tps: 3875.56089
+  dps: 12470.15602
+  tps: 7600.56154
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5658.80867
-  tps: 3416.99532
+  dps: 10297.38877
+  tps: 6309.54817
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6643.37894
-  tps: 3995.0823
+  dps: 12752.26959
+  tps: 7770.30597
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 6613.6337
-  tps: 3977.61128
+  dps: 12476.59273
+  tps: 7605.20203
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 6613.6337
-  tps: 3977.61128
+  dps: 12476.59273
+  tps: 7605.20203
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 6679.85653
-  tps: 4016.59356
+  dps: 12802.2088
+  tps: 7799.86184
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 6672.56101
-  tps: 4012.2913
+  dps: 12792.22095
+  tps: 7793.95066
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 6665.64631
-  tps: 4010.76803
+  dps: 12853.13546
+  tps: 7840.66802
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 6672.56101
-  tps: 4012.2913
+  dps: 12792.22095
+  tps: 7793.95066
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 6679.85653
-  tps: 4016.59356
+  dps: 12802.2088
+  tps: 7799.86184
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-WingedTalisman-37844"
  value: {
-  dps: 6546.82678
-  tps: 3940.95599
+  dps: 12620.80045
+  tps: 7690.9482
  }
 }
 dps_results: {
  key: "TestArcane-Average-Default"
  value: {
-  dps: 6893.00336
-  tps: 4146.67378
+  dps: 13260.73072
+  tps: 8080.20787
  }
 }
 dps_results: {
- key: "TestArcane-Settings-Troll-P1Arcane-Arcane-AOE-FullBuffs-LongMultiTarget"
+ key: "TestArcane-Settings-Troll-P3Arcane-Arcane-AOE-FullBuffs-LongMultiTarget"
  value: {
-  dps: 22239.57196
-  tps: 13377.00769
+  dps: 34730.07602
+  tps: 21076.49212
  }
 }
 dps_results: {
- key: "TestArcane-Settings-Troll-P1Arcane-Arcane-AOE-FullBuffs-LongSingleTarget"
+ key: "TestArcane-Settings-Troll-P3Arcane-Arcane-AOE-FullBuffs-LongSingleTarget"
  value: {
-  dps: 1401.30919
-  tps: 856.89933
+  dps: 2854.83804
+  tps: 1849.16181
  }
 }
 dps_results: {
- key: "TestArcane-Settings-Troll-P1Arcane-Arcane-AOE-FullBuffs-ShortSingleTarget"
+ key: "TestArcane-Settings-Troll-P3Arcane-Arcane-AOE-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 2449.67139
-  tps: 1387.29003
+  dps: 4287.71911
+  tps: 2592.73302
  }
 }
 dps_results: {
- key: "TestArcane-Settings-Troll-P1Arcane-Arcane-AOE-NoBuffs-LongMultiTarget"
+ key: "TestArcane-Settings-Troll-P3Arcane-Arcane-AOE-NoBuffs-LongMultiTarget"
  value: {
-  dps: 15282.67345
-  tps: 9396.1745
+  dps: 25840.51292
+  tps: 15914.7983
  }
 }
 dps_results: {
- key: "TestArcane-Settings-Troll-P1Arcane-Arcane-AOE-NoBuffs-LongSingleTarget"
+ key: "TestArcane-Settings-Troll-P3Arcane-Arcane-AOE-NoBuffs-LongSingleTarget"
  value: {
-  dps: 745.90754
-  tps: 481.29991
+  dps: 1441.08307
+  tps: 934.23463
  }
 }
 dps_results: {
- key: "TestArcane-Settings-Troll-P1Arcane-Arcane-AOE-NoBuffs-ShortSingleTarget"
+ key: "TestArcane-Settings-Troll-P3Arcane-Arcane-AOE-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 1510.83213
-  tps: 922.8711
+  dps: 2942.03567
+  tps: 1736.96021
  }
 }
 dps_results: {
- key: "TestArcane-Settings-Troll-P1Arcane-Arcane-Arcane-FullBuffs-LongMultiTarget"
+ key: "TestArcane-Settings-Troll-P3Arcane-Arcane-Arcane-FullBuffs-LongMultiTarget"
  value: {
-  dps: 6816.294
-  tps: 5611.09037
+  dps: 13162.2539
+  tps: 9910.00084
  }
 }
 dps_results: {
- key: "TestArcane-Settings-Troll-P1Arcane-Arcane-Arcane-FullBuffs-LongSingleTarget"
+ key: "TestArcane-Settings-Troll-P3Arcane-Arcane-Arcane-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6816.294
-  tps: 4098.7158
+  dps: 13162.2539
+  tps: 8018.98262
  }
 }
 dps_results: {
- key: "TestArcane-Settings-Troll-P1Arcane-Arcane-Arcane-FullBuffs-ShortSingleTarget"
+ key: "TestArcane-Settings-Troll-P3Arcane-Arcane-Arcane-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 9338.49754
-  tps: 5520.83961
+  dps: 17145.6478
+  tps: 10276.21701
  }
 }
 dps_results: {
- key: "TestArcane-Settings-Troll-P1Arcane-Arcane-Arcane-NoBuffs-LongMultiTarget"
+ key: "TestArcane-Settings-Troll-P3Arcane-Arcane-Arcane-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3455.75045
-  tps: 3315.26719
+  dps: 6817.85376
+  tps: 5700.68156
  }
 }
 dps_results: {
- key: "TestArcane-Settings-Troll-P1Arcane-Arcane-Arcane-NoBuffs-LongSingleTarget"
+ key: "TestArcane-Settings-Troll-P3Arcane-Arcane-Arcane-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3455.75045
-  tps: 2090.17099
+  dps: 6817.85376
+  tps: 4168.8512
  }
 }
 dps_results: {
- key: "TestArcane-Settings-Troll-P1Arcane-Arcane-Arcane-NoBuffs-ShortSingleTarget"
+ key: "TestArcane-Settings-Troll-P3Arcane-Arcane-Arcane-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4550.76028
-  tps: 2650.35738
+  dps: 8658.88561
+  tps: 5121.74378
  }
 }
 dps_results: {
  key: "TestArcane-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6816.294
-  tps: 4098.7158
+  dps: 13162.2539
+  tps: 8018.98262
  }
 }
diff --git a/sim/mage/TestFire.results b/sim/mage/TestFire.results
index 9a1d3ffade..ec00a61cb9 100644
--- a/sim/mage/TestFire.results
+++ b/sim/mage/TestFire.results
@@ -3,25 +3,25 @@ character_stats_results: {
  value: {
   final_stats: 303.6
   final_stats: 312.4
-  final_stats: 1341.45
-  final_stats: 1207.8
-  final_stats: 779.064
-  final_stats: 2743
+  final_stats: 1976.15
+  final_stats: 1892
+  final_stats: 560.56
+  final_stats: 4180
   final_stats: 109
   final_stats: 217
-  final_stats: 1532.06428
-  final_stats: 609
+  final_stats: 2333.34033
+  final_stats: 1238
   final_stats: 0
   final_stats: 755.7
   final_stats: 217
-  final_stats: 750.08921
-  final_stats: 609
+  final_stats: 1483.08921
+  final_stats: 1238
   final_stats: 0
   final_stats: 0
-  final_stats: 21105
+  final_stats: 31368
   final_stats: 0
   final_stats: 0
-  final_stats: 5420.3
+  final_stats: 5794.3
   final_stats: 755.7
   final_stats: 0
   final_stats: 0
@@ -29,7 +29,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 20197.5
+  final_stats: 26544.5
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -46,815 +46,808 @@ character_stats_results: {
 dps_results: {
  key: "TestFire-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 6356.62772
-  tps: 5080.57944
+  dps: 13028.84061
+  tps: 10452.60303
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 6391.0902
-  tps: 5107.72765
+  dps: 13080.07824
+  tps: 10493.1364
  }
 }
 dps_results: {
  key: "TestFire-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 6407.42422
-  tps: 5124.95626
+  dps: 13144.2358
+  tps: 10547.32873
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 6073.82952
-  tps: 4857.24765
-  hps: 94.83466
+  dps: 12615.52853
+  tps: 10124.27905
+  hps: 102.00333
  }
 }
 dps_results: {
  key: "TestFire-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 6073.82952
-  tps: 4857.24765
-  hps: 94.83466
+  dps: 12615.52853
+  tps: 10124.27905
+  hps: 102.00333
  }
 }
 dps_results: {
  key: "TestFire-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 6465.48455
-  tps: 5170.44075
+  dps: 13099.35327
+  tps: 10508.93796
  }
 }
 dps_results: {
  key: "TestFire-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 4897.22603
-  tps: 3913.76672
+  dps: 8304.77334
+  tps: 6668.09173
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Bloodmage'sRegalia"
  value: {
-  dps: 7038.00435
-  tps: 5625.88089
+  dps: 10896.05331
+  tps: 8748.76377
  }
 }
 dps_results: {
  key: "TestFire-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 6447.15479
-  tps: 5054.82438
+  dps: 13202.57359
+  tps: 10383.73084
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 6621.44798
-  tps: 5296.89371
+  dps: 13537.01064
+  tps: 10861.62758
  }
 }
 dps_results: {
  key: "TestFire-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
   hps: 64
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 6229.08481
-  tps: 4982.0107
+  dps: 12888.63045
+  tps: 10347.66742
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 6329.79715
-  tps: 5074.27739
+  dps: 12916.28896
+  tps: 10378.11898
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 6307.14054
-  tps: 5049.33563
+  dps: 12793.08195
+  tps: 10273.98352
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Death'sChoice-47464"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 6114.4472
-  tps: 4890.09124
+  dps: 12700.79121
+  tps: 10193.01699
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Defender'sCode-40257"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 6457.81194
-  tps: 5165.78771
- }
-}
-dps_results: {
- key: "TestFire-AllItems-DislodgedForeignObject-50348"
- value: {
-  dps: 6458.659
-  tps: 5165.18006
+  dps: 13124.05923
+  tps: 10530.74469
  }
 }
 dps_results: {
  key: "TestFire-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 6404.92237
-  tps: 5122.57858
+  dps: 13567.2238
+  tps: 10888.19491
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 6407.42422
-  tps: 5124.95626
+  dps: 13144.2358
+  tps: 10547.32873
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 6491.92074
-  tps: 5190.91468
+  dps: 13158.79644
+  tps: 10557.67839
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 6445.07883
-  tps: 5155.79839
+  dps: 13126.92195
+  tps: 10532.6048
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 6431.9024
-  tps: 5144.94788
+  dps: 13131.41086
+  tps: 10537.26032
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 6114.19219
-  tps: 4890.41119
+  dps: 12753.05075
+  tps: 10236.32987
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 6407.42422
-  tps: 5124.95626
+  dps: 13144.2358
+  tps: 10547.32873
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 6319.60544
-  tps: 5065.02772
+  dps: 13025.38937
+  tps: 10465.65184
  }
 }
 dps_results: {
  key: "TestFire-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6418.5861
-  tps: 5132.26323
+  dps: 13143.96839
+  tps: 10551.21513
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 6242.97521
-  tps: 5000.50656
+  dps: 12742.5806
+  tps: 10231.79776
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 6250.10735
-  tps: 4996.66678
+  dps: 12870.46974
+  tps: 10327.31807
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6356.47604
-  tps: 5084.18944
+  dps: 12988.14279
+  tps: 10424.89054
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 6447.15479
-  tps: 5156.26193
+  dps: 13202.57359
+  tps: 10593.47874
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 6439.20867
-  tps: 5150.0008
+  dps: 13190.90603
+  tps: 10584.24874
  }
 }
 dps_results: {
  key: "TestFire-AllItems-FrostfireGarb"
  value: {
-  dps: 5885.10675
-  tps: 4709.88644
+  dps: 9123.47966
+  tps: 7337.49908
  }
 }
 dps_results: {
  key: "TestFire-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-FuturesightRune-38763"
  value: {
-  dps: 6264.54538
-  tps: 5009.85557
+  dps: 12908.63665
+  tps: 10361.02508
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Gladiator'sRegalia"
  value: {
-  dps: 6390.18533
-  tps: 5103.20294
+  dps: 9568.24702
+  tps: 7679.23651
  }
 }
 dps_results: {
  key: "TestFire-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 6373.85896
-  tps: 5094.15354
+  dps: 13054.45942
+  tps: 10472.86972
  }
 }
 dps_results: {
  key: "TestFire-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 6413.02086
-  tps: 5125.00379
+  dps: 13112.68401
+  tps: 10518.93036
  }
 }
 dps_results: {
  key: "TestFire-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 6345.17277
-  tps: 5084.34013
+  dps: 12938.66617
+  tps: 10394.26786
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Heartpierce-49982"
  value: {
-  dps: 6621.44798
-  tps: 5296.89371
+  dps: 13537.01064
+  tps: 10861.62758
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Heartpierce-50641"
  value: {
-  dps: 6621.44798
-  tps: 5296.89371
+  dps: 13537.01064
+  tps: 10861.62758
  }
 }
 dps_results: {
  key: "TestFire-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6375.91303
-  tps: 5097.48003
+  dps: 13059.18159
+  tps: 10478.50787
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 6445.07883
-  tps: 5155.79839
+  dps: 13126.92195
+  tps: 10532.6048
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 6431.9024
-  tps: 5144.94788
+  dps: 13131.41086
+  tps: 10537.26032
  }
 }
 dps_results: {
  key: "TestFire-AllItems-IncisorFragment-37723"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 6508.83204
-  tps: 5212.9161
+  dps: 13112.19826
+  tps: 10530.16139
  }
 }
 dps_results: {
  key: "TestFire-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 6407.42422
-  tps: 5124.95626
+  dps: 13144.2358
+  tps: 10547.32873
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Khadgar'sRegalia"
  value: {
-  dps: 6603.00405
-  tps: 5279.08811
+  dps: 10018.53961
+  tps: 8058.82798
  }
 }
 dps_results: {
  key: "TestFire-AllItems-KirinTorGarb"
  value: {
-  dps: 6604.51272
-  tps: 5273.72384
+  dps: 10189.80669
+  tps: 8183.44719
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6424.17631
-  tps: 5140.37459
+  dps: 12998.92124
+  tps: 10434.46546
  }
 }
 dps_results: {
  key: "TestFire-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 6202.82537
-  tps: 4961.15998
+  dps: 12768.27319
+  tps: 10250.30251
  }
 }
 dps_results: {
  key: "TestFire-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 6363.78178
-  tps: 5088.20222
+  dps: 12965.95491
+  tps: 10404.61806
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Nibelung-49992"
  value: {
-  dps: 6621.44798
-  tps: 5296.89371
+  dps: 13537.01064
+  tps: 10861.62758
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Nibelung-50648"
  value: {
-  dps: 6621.44798
-  tps: 5296.89371
+  dps: 13537.01064
+  tps: 10861.62758
  }
 }
 dps_results: {
  key: "TestFire-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 6407.42422
-  tps: 5124.95626
+  dps: 13144.2358
+  tps: 10547.32873
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 6407.42422
-  tps: 5124.95626
+  dps: 13144.2358
+  tps: 10547.32873
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 6407.42422
-  tps: 5124.95626
+  dps: 13144.2358
+  tps: 10547.32873
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 6407.42422
-  tps: 5124.95626
+  dps: 13144.2358
+  tps: 10547.32873
  }
 }
 dps_results: {
  key: "TestFire-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6583.57997
-  tps: 5294.06994
+  dps: 13169.41462
+  tps: 10608.87838
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6631.30284
-  tps: 5335.69671
+  dps: 13238.6363
+  tps: 10669.34937
  }
 }
 dps_results: {
  key: "TestFire-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 6581.69481
-  tps: 5264.37273
+  dps: 13553.65593
+  tps: 10875.81418
  }
 }
 dps_results: {
  key: "TestFire-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 6442.05363
-  tps: 5152.36818
+  dps: 13098.47938
+  tps: 10511.18673
  }
 }
 dps_results: {
  key: "TestFire-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 6446.72925
-  tps: 5159.41001
+  dps: 13034.42366
+  tps: 10464.0804
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 6516.87346
-  tps: 5217.20131
+  dps: 13056.25583
+  tps: 10480.57517
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SoulPreserver-37111"
  value: {
-  dps: 6193.71421
-  tps: 4952.24243
+  dps: 12786.62634
+  tps: 10260.99074
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SouloftheDead-40382"
  value: {
-  dps: 6382.36127
-  tps: 5114.25738
+  dps: 12928.81406
+  tps: 10388.29645
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SparkofLife-37657"
  value: {
-  dps: 6330.01084
-  tps: 5064.24564
+  dps: 12751.48663
+  tps: 10237.29762
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 6251.04731
-  tps: 4998.77816
+  dps: 13057.05832
+  tps: 10479.78658
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 6407.42422
-  tps: 5124.95626
+  dps: 13144.2358
+  tps: 10547.32873
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 6407.42422
-  tps: 5124.95626
+  dps: 13144.2358
+  tps: 10547.32873
  }
 }
 dps_results: {
  key: "TestFire-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 6407.42422
-  tps: 5124.95626
+  dps: 13144.2358
+  tps: 10547.32873
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 6235.67496
-  tps: 4988.12171
+  dps: 12728.32061
+  tps: 10217.71982
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 6299.37118
-  tps: 5042.73815
+  dps: 12697.85392
+  tps: 10192.65683
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TempestRegalia"
  value: {
-  dps: 4546.03826
-  tps: 3635.29335
+  dps: 6671.22957
+  tps: 5364.40795
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 6076.2285
-  tps: 4859.6917
+  dps: 12611.95259
+  tps: 10122.8088
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 5187.2157
-  tps: 4156.49078
+  dps: 10234.83154
+  tps: 8234.30648
  }
 }
 dps_results: {
  key: "TestFire-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6407.42422
-  tps: 5124.95626
+  dps: 13144.2358
+  tps: 10547.32873
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 6392.95799
-  tps: 5114.40687
+  dps: 13222.67691
+  tps: 10614.59313
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 6392.95799
-  tps: 5114.40687
+  dps: 13222.67691
+  tps: 10614.59313
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 6447.15479
-  tps: 5156.26193
+  dps: 13202.57359
+  tps: 10593.47874
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 6439.20867
-  tps: 5150.0008
+  dps: 13190.90603
+  tps: 10584.24874
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 6246.45013
-  tps: 4993.99666
+  dps: 12940.85165
+  tps: 10386.79224
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 6439.20867
-  tps: 5150.0008
+  dps: 13190.90603
+  tps: 10584.24874
  }
 }
 dps_results: {
  key: "TestFire-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 6447.15479
-  tps: 5156.26193
+  dps: 13202.57359
+  tps: 10593.47874
  }
 }
 dps_results: {
  key: "TestFire-AllItems-WingedTalisman-37844"
  value: {
-  dps: 6206.96166
-  tps: 4964.27822
+  dps: 12805.60721
+  tps: 10277.7325
  }
 }
 dps_results: {
  key: "TestFire-Average-Default"
  value: {
-  dps: 6725.67335
-  tps: 5378.69379
+  dps: 13570.89308
+  tps: 10888.66106
  }
 }
 dps_results: {
- key: "TestFire-Settings-Troll-P1Fire-Fire-AOE-FullBuffs-LongMultiTarget"
+ key: "TestFire-Settings-Troll-P3Fire-Fire-AOE-FullBuffs-LongMultiTarget"
  value: {
-  dps: 42304.64393
-  tps: 39629.66856
+  dps: 73309.58146
+  tps: 66029.54464
  }
 }
 dps_results: {
- key: "TestFire-Settings-Troll-P1Fire-Fire-AOE-FullBuffs-LongSingleTarget"
+ key: "TestFire-Settings-Troll-P3Fire-Fire-AOE-FullBuffs-LongSingleTarget"
  value: {
-  dps: 2559.98392
-  tps: 1998.67226
+  dps: 4749.16727
+  tps: 3730.80045
  }
 }
 dps_results: {
- key: "TestFire-Settings-Troll-P1Fire-Fire-AOE-FullBuffs-ShortSingleTarget"
+ key: "TestFire-Settings-Troll-P3Fire-Fire-AOE-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 3829.65787
-  tps: 2867.27969
+  dps: 6494.54896
+  tps: 4928.39197
  }
 }
 dps_results: {
- key: "TestFire-Settings-Troll-P1Fire-Fire-AOE-NoBuffs-LongMultiTarget"
+ key: "TestFire-Settings-Troll-P3Fire-Fire-AOE-NoBuffs-LongMultiTarget"
  value: {
-  dps: 22660.76278
-  tps: 22798.32887
+  dps: 45021.98204
+  tps: 42628.06037
  }
 }
 dps_results: {
- key: "TestFire-Settings-Troll-P1Fire-Fire-AOE-NoBuffs-LongSingleTarget"
+ key: "TestFire-Settings-Troll-P3Fire-Fire-AOE-NoBuffs-LongSingleTarget"
  value: {
-  dps: 1220.0746
-  tps: 978.35309
+  dps: 2071.43814
+  tps: 1624.67343
  }
 }
 dps_results: {
- key: "TestFire-Settings-Troll-P1Fire-Fire-AOE-NoBuffs-ShortSingleTarget"
+ key: "TestFire-Settings-Troll-P3Fire-Fire-AOE-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 2185.96357
-  tps: 1719.38981
+  dps: 4031.35307
+  tps: 3009.02945
  }
 }
 dps_results: {
- key: "TestFire-Settings-Troll-P1Fire-Fire-Fire-FullBuffs-LongMultiTarget"
+ key: "TestFire-Settings-Troll-P3Fire-Fire-Fire-FullBuffs-LongMultiTarget"
  value: {
-  dps: 25763.80419
-  tps: 24849.91926
+  dps: 43550.54114
+  tps: 38979.67235
  }
 }
 dps_results: {
- key: "TestFire-Settings-Troll-P1Fire-Fire-Fire-FullBuffs-LongSingleTarget"
+ key: "TestFire-Settings-Troll-P3Fire-Fire-Fire-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6621.44798
-  tps: 5296.89371
+  dps: 13537.01064
+  tps: 10861.62758
  }
 }
 dps_results: {
- key: "TestFire-Settings-Troll-P1Fire-Fire-Fire-FullBuffs-ShortSingleTarget"
+ key: "TestFire-Settings-Troll-P3Fire-Fire-Fire-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 8191.77781
-  tps: 6458.20252
+  dps: 16243.3696
+  tps: 12886.20774
  }
 }
 dps_results: {
- key: "TestFire-Settings-Troll-P1Fire-Fire-Fire-NoBuffs-LongMultiTarget"
+ key: "TestFire-Settings-Troll-P3Fire-Fire-Fire-NoBuffs-LongMultiTarget"
  value: {
-  dps: 10915.48279
-  tps: 11493.59376
+  dps: 20312.74777
+  tps: 19464.00325
  }
 }
 dps_results: {
- key: "TestFire-Settings-Troll-P1Fire-Fire-Fire-NoBuffs-LongSingleTarget"
+ key: "TestFire-Settings-Troll-P3Fire-Fire-Fire-NoBuffs-LongSingleTarget"
  value: {
-  dps: 2563.76731
-  tps: 2046.91402
+  dps: 5354.68123
+  tps: 4285.09981
  }
 }
 dps_results: {
- key: "TestFire-Settings-Troll-P1Fire-Fire-Fire-NoBuffs-ShortSingleTarget"
+ key: "TestFire-Settings-Troll-P3Fire-Fire-Fire-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 4007.63648
-  tps: 3115.92478
+  dps: 8648.49365
+  tps: 6804.2063
  }
 }
 dps_results: {
  key: "TestFire-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6621.44798
-  tps: 5296.89371
+  dps: 13537.01064
+  tps: 10861.62758
  }
 }
diff --git a/sim/mage/TestFrost.results b/sim/mage/TestFrost.results
index d3c5a6579c..5f3e48af4d 100644
--- a/sim/mage/TestFrost.results
+++ b/sim/mage/TestFrost.results
@@ -3,25 +3,25 @@ character_stats_results: {
  value: {
   final_stats: 303.6
   final_stats: 312.4
-  final_stats: 1341.45
-  final_stats: 1207.8
-  final_stats: 779.064
-  final_stats: 2743
+  final_stats: 1976.15
+  final_stats: 1892
+  final_stats: 560.56
+  final_stats: 4180
   final_stats: 109
   final_stats: 295.69598
-  final_stats: 965.86112
-  final_stats: 609
+  final_stats: 1887.31437
+  final_stats: 1238
   final_stats: 0
   final_stats: 755.7
   final_stats: 217
-  final_stats: 750.08921
-  final_stats: 609
+  final_stats: 1483.08921
+  final_stats: 1238
   final_stats: 0
   final_stats: 0
-  final_stats: 21105
+  final_stats: 31368
   final_stats: 0
   final_stats: 0
-  final_stats: 5420.3
+  final_stats: 5794.3
   final_stats: 755.7
   final_stats: 0
   final_stats: 0
@@ -29,7 +29,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 20197.5
+  final_stats: 26544.5
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -46,815 +46,808 @@ character_stats_results: {
 dps_results: {
  key: "TestFrost-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 5553.46764
-  tps: 4417.53493
+  dps: 10373.47493
+  tps: 8570.38605
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 5583.71904
-  tps: 4442.13712
+  dps: 10414.1201
+  tps: 8604.19582
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 5431.55188
-  tps: 4313.3355
+  dps: 10310.86312
+  tps: 8523.53904
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 5306.67881
-  tps: 4217.08825
-  hps: 89.46807
+  dps: 10043.54449
+  tps: 8296.31856
+  hps: 100.90859
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 5306.67881
-  tps: 4217.08825
-  hps: 89.46807
+  dps: 10043.54449
+  tps: 8296.31856
+  hps: 100.90859
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 5446.65066
-  tps: 4326.61139
+  dps: 10346.15133
+  tps: 8554.93468
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 4641.93116
-  tps: 3658.32724
+  dps: 7508.14041
+  tps: 6112.57919
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Bloodmage'sRegalia"
  value: {
-  dps: 6088.03698
-  tps: 4908.67923
+  dps: 9094.0907
+  tps: 7497.70523
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 5465.60245
-  tps: 4254.60937
+  dps: 10356.38021
+  tps: 8390.59089
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 5573.8696
-  tps: 4440.86268
+  dps: 10666.20431
+  tps: 8842.98368
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
   hps: 64
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 5367.77672
-  tps: 4271.00889
+  dps: 10096.80526
+  tps: 8344.06018
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 5379.15751
-  tps: 4277.76877
+  dps: 10089.80132
+  tps: 8329.77579
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 5349.46106
-  tps: 4261.64606
+  dps: 10078.94588
+  tps: 8339.4118
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Death'sChoice-47464"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 5320.71932
-  tps: 4228.86935
+  dps: 10050.87834
+  tps: 8302.15318
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Defender'sCode-40257"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 5449.57535
-  tps: 4329.32841
- }
-}
-dps_results: {
- key: "TestFrost-AllItems-DislodgedForeignObject-50348"
- value: {
-  dps: 5746.5045
-  tps: 4604.53403
+  dps: 10348.85069
+  tps: 8558.37205
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 5740.60798
-  tps: 4603.72622
+  dps: 10553.86596
+  tps: 8738.25744
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 5431.55188
-  tps: 4313.3355
+  dps: 10310.86312
+  tps: 8523.53904
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 5466.52116
-  tps: 4341.48217
+  dps: 10366.00089
+  tps: 8567.22459
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 5446.07383
-  tps: 4326.17704
+  dps: 10346.1715
+  tps: 8555.61669
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 5441.79488
-  tps: 4322.34074
+  dps: 10326.97655
+  tps: 8536.73575
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 5360.14221
-  tps: 4259.24377
+  dps: 10129.77938
+  tps: 8370.1159
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 5431.55188
-  tps: 4313.3355
+  dps: 10310.86312
+  tps: 8523.53904
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 5344.15038
-  tps: 4247.43064
+  dps: 10101.40893
+  tps: 8343.64054
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 5528.13352
-  tps: 4413.14538
+  dps: 10322.02486
+  tps: 8544.29858
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 5305.43129
-  tps: 4215.22657
+  dps: 10048.16094
+  tps: 8299.36962
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 5459.9633
-  tps: 4341.4918
+  dps: 10247.8444
+  tps: 8465.88311
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ForgeEmber-37660"
  value: {
-  dps: 5469.78973
-  tps: 4361.30636
+  dps: 10238.83787
+  tps: 8470.80732
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 5465.60245
-  tps: 4340.93195
+  dps: 10356.38021
+  tps: 8561.31825
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 5458.79234
-  tps: 4335.41266
+  dps: 10347.27679
+  tps: 8553.76241
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-FrostfireGarb"
  value: {
-  dps: 4980.63354
-  tps: 3937.38744
+  dps: 7452.5413
+  tps: 6059.05183
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-FuturesightRune-38763"
  value: {
-  dps: 5389.07511
-  tps: 4282.62386
+  dps: 10157.57373
+  tps: 8389.89329
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Gladiator'sRegalia"
  value: {
-  dps: 5490.92855
-  tps: 4343.30948
+  dps: 7951.70996
+  tps: 6444.82423
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 5568.59334
-  tps: 4429.83603
+  dps: 10393.79751
+  tps: 8587.29094
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 5602.96994
-  tps: 4457.79306
+  dps: 10439.98521
+  tps: 8625.71113
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 5338.11703
-  tps: 4240.2063
+  dps: 10081.10047
+  tps: 8326.25353
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Heartpierce-49982"
  value: {
-  dps: 5573.8696
-  tps: 4440.86268
+  dps: 10666.20431
+  tps: 8842.98368
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Heartpierce-50641"
  value: {
-  dps: 5573.8696
-  tps: 4440.86268
+  dps: 10666.20431
+  tps: 8842.98368
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 5552.49159
-  tps: 4435.11568
+  dps: 10379.57156
+  tps: 8594.71981
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 5446.07383
-  tps: 4326.17704
+  dps: 10346.1715
+  tps: 8555.61669
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 5441.79488
-  tps: 4322.34074
+  dps: 10326.97655
+  tps: 8536.73575
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-IncisorFragment-37723"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 5424.12564
-  tps: 4309.12901
+  dps: 10320.34087
+  tps: 8533.48878
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 5431.55188
-  tps: 4313.3355
+  dps: 10310.86312
+  tps: 8523.53904
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Khadgar'sRegalia"
  value: {
-  dps: 5366.04196
-  tps: 4271.35098
+  dps: 8121.42889
+  tps: 6630.66485
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-KirinTorGarb"
  value: {
-  dps: 5396.91295
-  tps: 4291.85504
+  dps: 8053.70613
+  tps: 6570.78797
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 5294.64129
-  tps: 4203.14187
+  dps: 10043.39073
+  tps: 8291.17489
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 5353.97738
-  tps: 4258.50806
+  dps: 10072.09869
+  tps: 8322.64708
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 5507.40905
-  tps: 4384.08195
+  dps: 10295.23056
+  tps: 8511.4276
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Nibelung-49992"
  value: {
-  dps: 5573.8696
-  tps: 4440.86268
+  dps: 10666.20431
+  tps: 8842.98368
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Nibelung-50648"
  value: {
-  dps: 5573.8696
-  tps: 4440.86268
+  dps: 10666.20431
+  tps: 8842.98368
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 5431.55188
-  tps: 4313.3355
+  dps: 10310.86312
+  tps: 8523.53904
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 5431.55188
-  tps: 4313.3355
+  dps: 10310.86312
+  tps: 8523.53904
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 5306.50073
-  tps: 4216.61514
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 5431.55188
-  tps: 4313.3355
+  dps: 10310.86312
+  tps: 8523.53904
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 5431.55188
-  tps: 4313.3355
+  dps: 10310.86312
+  tps: 8523.53904
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 5593.98874
-  tps: 4461.66717
+  dps: 10447.68327
+  tps: 8646.88526
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 5635.03215
-  tps: 4498.08347
+  dps: 10508.65409
+  tps: 8702.25018
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 5558.06057
-  tps: 4426.86541
+  dps: 10627.83327
+  tps: 8808.15006
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 5430.76479
-  tps: 4312.04274
+  dps: 10310.74901
+  tps: 8522.65734
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 5519.32166
-  tps: 4393.06627
+  dps: 10335.14951
+  tps: 8541.60581
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 5546.14479
-  tps: 4415.23217
+  dps: 10372.09456
+  tps: 8572.59573
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SoulPreserver-37111"
  value: {
-  dps: 5410.461
-  tps: 4301.23368
+  dps: 10181.33412
+  tps: 8410.55803
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SouloftheDead-40382"
  value: {
-  dps: 5353.65393
-  tps: 4261.74422
+  dps: 10104.76364
+  tps: 8353.52438
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SparkofLife-37657"
  value: {
-  dps: 5364.95222
-  tps: 4259.80263
+  dps: 10084.94839
+  tps: 8336.68862
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 5392.78625
-  tps: 4287.96947
+  dps: 10132.52109
+  tps: 8367.25669
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 5431.55188
-  tps: 4313.3355
+  dps: 10310.86312
+  tps: 8523.53904
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 5431.55188
-  tps: 4313.3355
+  dps: 10310.86312
+  tps: 8523.53904
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 5431.55188
-  tps: 4313.3355
+  dps: 10310.86312
+  tps: 8523.53904
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 5301.5726
-  tps: 4210.93682
+  dps: 10043.32975
+  tps: 8294.65829
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 5313.76282
-  tps: 4221.40848
+  dps: 10056.04105
+  tps: 8306.22478
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TempestRegalia"
  value: {
-  dps: 4333.95367
-  tps: 3408.9819
+  dps: 6045.41983
+  tps: 4866.09121
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 5307.33122
-  tps: 4217.36258
+  dps: 10042.77104
+  tps: 8295.29743
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 4511.91288
-  tps: 3564.26892
+  dps: 8267.62797
+  tps: 6831.43539
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 5431.55188
-  tps: 4313.3355
+  dps: 10310.86312
+  tps: 8523.53904
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 5441.97103
-  tps: 4325.37592
+  dps: 10181.35436
+  tps: 8411.35821
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 5441.97103
-  tps: 4325.37592
+  dps: 10181.35436
+  tps: 8411.35821
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 5465.60245
-  tps: 4340.93195
+  dps: 10356.38021
+  tps: 8561.31825
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 5458.79234
-  tps: 4335.41266
+  dps: 10347.27679
+  tps: 8553.76241
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 5404.95524
-  tps: 4292.88074
+  dps: 10254.86499
+  tps: 8480.0837
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 5458.79234
-  tps: 4335.41266
+  dps: 10347.27679
+  tps: 8553.76241
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 5465.60245
-  tps: 4340.93195
+  dps: 10356.38021
+  tps: 8561.31825
  }
 }
 dps_results: {
  key: "TestFrost-AllItems-WingedTalisman-37844"
  value: {
-  dps: 5397.95173
-  tps: 4298.6546
+  dps: 10169.59192
+  tps: 8408.90705
  }
 }
 dps_results: {
  key: "TestFrost-Average-Default"
  value: {
-  dps: 5650.97852
-  tps: 4516.35036
+  dps: 10765.42518
+  tps: 8937.88862
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Troll-P1Frost-Frost-AOE-FullBuffs-LongMultiTarget"
+ key: "TestFrost-Settings-Troll-P3Frost-Frost-AOE-FullBuffs-LongMultiTarget"
  value: {
-  dps: 12197.87265
-  tps: 11419.85764
+  dps: 19084.08525
+  tps: 17635.61761
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Troll-P1Frost-Frost-AOE-FullBuffs-LongSingleTarget"
+ key: "TestFrost-Settings-Troll-P3Frost-Frost-AOE-FullBuffs-LongSingleTarget"
  value: {
-  dps: 1794.28737
-  tps: 1090.71894
+  dps: 2663.11151
+  tps: 1701.21147
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Troll-P1Frost-Frost-AOE-FullBuffs-ShortSingleTarget"
+ key: "TestFrost-Settings-Troll-P3Frost-Frost-AOE-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 2843.66441
-  tps: 1918.25527
+  dps: 4203.99418
+  tps: 2919.45313
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Troll-P1Frost-Frost-AOE-NoBuffs-LongMultiTarget"
+ key: "TestFrost-Settings-Troll-P3Frost-Frost-AOE-NoBuffs-LongMultiTarget"
  value: {
-  dps: 6089.3529
-  tps: 5875.01697
+  dps: 9091.55483
+  tps: 8530.3094
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Troll-P1Frost-Frost-AOE-NoBuffs-LongSingleTarget"
+ key: "TestFrost-Settings-Troll-P3Frost-Frost-AOE-NoBuffs-LongSingleTarget"
  value: {
-  dps: 1014.82993
-  tps: 547.10358
+  dps: 1462.15638
+  tps: 808.37765
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Troll-P1Frost-Frost-AOE-NoBuffs-ShortSingleTarget"
+ key: "TestFrost-Settings-Troll-P3Frost-Frost-AOE-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 1696.29552
-  tps: 1053.05014
+  dps: 2551.80109
+  tps: 1621.28385
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Troll-P1Frost-Frost-Frost-FullBuffs-LongMultiTarget"
+ key: "TestFrost-Settings-Troll-P3Frost-Frost-Frost-FullBuffs-LongMultiTarget"
  value: {
-  dps: 5573.8696
-  tps: 4912.11949
+  dps: 10666.20431
+  tps: 9311.0682
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Troll-P1Frost-Frost-Frost-FullBuffs-LongSingleTarget"
+ key: "TestFrost-Settings-Troll-P3Frost-Frost-Frost-FullBuffs-LongSingleTarget"
  value: {
-  dps: 5573.8696
-  tps: 4440.86268
+  dps: 10666.20431
+  tps: 8842.98368
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Troll-P1Frost-Frost-Frost-FullBuffs-ShortSingleTarget"
+ key: "TestFrost-Settings-Troll-P3Frost-Frost-Frost-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 6915.5758
-  tps: 5519.53309
+  dps: 13061.96101
+  tps: 10797.27816
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Troll-P1Frost-Frost-Frost-NoBuffs-LongMultiTarget"
+ key: "TestFrost-Settings-Troll-P3Frost-Frost-Frost-NoBuffs-LongMultiTarget"
  value: {
-  dps: 3245.06978
-  tps: 3248.39961
+  dps: 6616.1424
+  tps: 5776.65904
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Troll-P1Frost-Frost-Frost-NoBuffs-LongSingleTarget"
+ key: "TestFrost-Settings-Troll-P3Frost-Frost-Frost-NoBuffs-LongSingleTarget"
  value: {
-  dps: 3245.06978
-  tps: 2533.66055
+  dps: 6616.1424
+  tps: 5399.26122
  }
 }
 dps_results: {
- key: "TestFrost-Settings-Troll-P1Frost-Frost-Frost-NoBuffs-ShortSingleTarget"
+ key: "TestFrost-Settings-Troll-P3Frost-Frost-Frost-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3680.77876
-  tps: 2823.25864
+  dps: 7539.69394
+  tps: 6097.0305
  }
 }
 dps_results: {
  key: "TestFrost-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 5573.8696
-  tps: 4440.86268
+  dps: 10666.20431
+  tps: 8842.98368
  }
 }
diff --git a/sim/mage/TestFrostFire.results b/sim/mage/TestFrostFire.results
index 74ac208576..5f6f1be1cd 100644
--- a/sim/mage/TestFrostFire.results
+++ b/sim/mage/TestFrostFire.results
@@ -3,25 +3,25 @@ character_stats_results: {
  value: {
   final_stats: 303.6
   final_stats: 312.4
-  final_stats: 1341.45
-  final_stats: 1207.8
-  final_stats: 779.064
-  final_stats: 2743
+  final_stats: 1976.15
+  final_stats: 1892
+  final_stats: 560.56
+  final_stats: 4180
   final_stats: 109
   final_stats: 217
-  final_stats: 1532.06428
-  final_stats: 609
+  final_stats: 2333.34033
+  final_stats: 1238
   final_stats: 0
   final_stats: 755.7
   final_stats: 217
-  final_stats: 750.08921
-  final_stats: 609
+  final_stats: 1483.08921
+  final_stats: 1238
   final_stats: 0
   final_stats: 0
-  final_stats: 21105
+  final_stats: 31368
   final_stats: 0
   final_stats: 0
-  final_stats: 5420.3
+  final_stats: 5794.3
   final_stats: 755.7
   final_stats: 0
   final_stats: 0
@@ -29,7 +29,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 20197.5
+  final_stats: 26544.5
   final_stats: 75
   final_stats: 75
   final_stats: 75
@@ -46,773 +46,766 @@ character_stats_results: {
 dps_results: {
  key: "TestFrostFire-AllItems-Althor'sAbacus-50359"
  value: {
-  dps: 6130.20663
-  tps: 4889.19189
+  dps: 12202.37061
+  tps: 9765.61242
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 6164.04395
-  tps: 4915.84847
+  dps: 12250.59587
+  tps: 9803.72114
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-AustereEarthsiegeDiamond"
  value: {
-  dps: 6007.67604
-  tps: 4791.13754
+  dps: 12137.76742
+  tps: 9724.59535
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Bandit'sInsignia-40371"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BaubleofTrueBlood-50354"
  value: {
-  dps: 5859.2779
-  tps: 4676.94145
-  hps: 94.27146
+  dps: 11819.26866
+  tps: 9461.52885
+  hps: 101.94314
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 5859.2779
-  tps: 4676.94145
-  hps: 94.27146
+  dps: 11819.26866
+  tps: 9461.52885
+  hps: 101.94314
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BeamingEarthsiegeDiamond"
  value: {
-  dps: 6085.15984
-  tps: 4847.06389
+  dps: 12254.1878
+  tps: 9814.49692
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BlessedRegaliaofUndeadCleansing"
  value: {
-  dps: 4917.92979
-  tps: 3929.16153
+  dps: 8024.04552
+  tps: 6452.89931
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Bloodmage'sRegalia"
  value: {
-  dps: 6768.3782
-  tps: 5407.32316
+  dps: 10273.38545
+  tps: 8258.97302
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-BracingEarthsiegeDiamond"
  value: {
-  dps: 6045.55176
-  tps: 4725.96274
+  dps: 12191.98927
+  tps: 9573.73022
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ChaoticSkyflareDiamond"
  value: {
-  dps: 6230.8402
-  tps: 4969.57344
+  dps: 12617.27832
+  tps: 10114.35882
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-CorpseTongueCoin-50352"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-CorrodedSkeletonKey-50356"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
   hps: 64
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DarkmoonCard:Berserker!-42989"
  value: {
-  dps: 6010.65698
-  tps: 4794.8163
+  dps: 12065.55473
+  tps: 9659.88709
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DarkmoonCard:Death-42990"
  value: {
-  dps: 5971.22541
-  tps: 4772.3862
+  dps: 12094.82815
+  tps: 9704.56973
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DarkmoonCard:Greatness-44255"
  value: {
-  dps: 5977.14709
-  tps: 4761.9798
+  dps: 11969.72851
+  tps: 9584.11903
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Death'sChoice-47464"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DeathKnight'sAnguish-38212"
  value: {
-  dps: 5881.74589
-  tps: 4693.51762
+  dps: 11877.64248
+  tps: 9506.23509
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Deathbringer'sWill-50362"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Defender'sCode-40257"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DestructiveSkyflareDiamond"
  value: {
-  dps: 6065.94912
-  tps: 4836.65246
- }
-}
-dps_results: {
- key: "TestFrostFire-AllItems-DislodgedForeignObject-50348"
- value: {
-  dps: 6243.58378
-  tps: 4987.66734
+  dps: 12227.93848
+  tps: 9800.34578
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-DislodgedForeignObject-50353"
  value: {
-  dps: 6164.29461
-  tps: 4923.57953
+  dps: 12552.11775
+  tps: 10060.3793
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EffulgentSkyflareDiamond"
  value: {
-  dps: 6007.67604
-  tps: 4791.13754
+  dps: 12137.76742
+  tps: 9724.59535
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EmberSkyflareDiamond"
  value: {
-  dps: 6086.18048
-  tps: 4849.81438
+  dps: 12292.28695
+  tps: 9844.47412
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EnigmaticSkyflareDiamond"
  value: {
-  dps: 6056.78293
-  tps: 4830.32763
+  dps: 12224.27139
+  tps: 9798.85074
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EnigmaticStarflareDiamond"
  value: {
-  dps: 6042.81247
-  tps: 4819.1169
+  dps: 12198.34884
+  tps: 9779.51362
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EphemeralSnowflake-50260"
  value: {
-  dps: 5929.14191
-  tps: 4737.02793
+  dps: 12047.14394
+  tps: 9647.20795
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EssenceofGossamer-37220"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EternalEarthsiegeDiamond"
  value: {
-  dps: 6007.67604
-  tps: 4791.13754
+  dps: 12137.76742
+  tps: 9724.59535
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ExtractofNecromanticPower-40373"
  value: {
-  dps: 5941.43912
-  tps: 4750.44096
+  dps: 12153.81159
+  tps: 9747.5587
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-EyeoftheBroodmother-45308"
  value: {
-  dps: 6186.52925
-  tps: 4936.54454
+  dps: 12316.57636
+  tps: 9860.96996
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Figurine-SapphireOwl-42413"
  value: {
-  dps: 5891.50542
-  tps: 4697.88283
+  dps: 11789.73442
+  tps: 9439.14953
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ForethoughtTalisman-40258"
  value: {
-  dps: 6025.61855
-  tps: 4806.79882
+  dps: 12053.31072
+  tps: 9647.82181
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ForgeEmber-37660"
  value: {
-  dps: 6096.11323
-  tps: 4864.35964
+  dps: 12210.0419
+  tps: 9773.00812
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ForlornSkyflareDiamond"
  value: {
-  dps: 6045.55176
-  tps: 4820.95243
+  dps: 12191.98927
+  tps: 9767.4605
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ForlornStarflareDiamond"
  value: {
-  dps: 6037.97661
-  tps: 4814.98945
+  dps: 12181.1449
+  tps: 9758.88747
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-FrostfireGarb"
  value: {
-  dps: 5568.57035
-  tps: 4433.43809
+  dps: 8677.88231
+  tps: 6960.03015
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-FuryoftheFiveFlights-40431"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-FuturesightRune-38763"
  value: {
-  dps: 5972.53508
-  tps: 4765.08613
+  dps: 12013.04697
+  tps: 9615.91357
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Gladiator'sRegalia"
  value: {
-  dps: 6049.83233
-  tps: 4816.31534
+  dps: 8997.68478
+  tps: 7202.92782
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-GlowingTwilightScale-54573"
  value: {
-  dps: 6147.12529
-  tps: 4902.52018
+  dps: 12226.48324
+  tps: 9784.66678
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 6185.57679
-  tps: 4932.81175
+  dps: 12281.28467
+  tps: 9827.97215
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-GnomishLightningGenerator-41121"
  value: {
-  dps: 5969.32856
-  tps: 4767.78403
+  dps: 12141.03923
+  tps: 9734.9791
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Heartpierce-49982"
  value: {
-  dps: 6230.8402
-  tps: 4969.57344
+  dps: 12617.27832
+  tps: 10114.35882
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Heartpierce-50641"
  value: {
-  dps: 6230.8402
-  tps: 4969.57344
+  dps: 12617.27832
+  tps: 10114.35882
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-IllustrationoftheDragonSoul-40432"
  value: {
-  dps: 6149.65114
-  tps: 4906.19148
+  dps: 12232.0677
+  tps: 9791.06347
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ImpassiveSkyflareDiamond"
  value: {
-  dps: 6056.78293
-  tps: 4830.32763
+  dps: 12224.27139
+  tps: 9798.85074
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ImpassiveStarflareDiamond"
  value: {
-  dps: 6042.81247
-  tps: 4819.1169
+  dps: 12198.34884
+  tps: 9779.51362
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-IncisorFragment-37723"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-InsightfulEarthsiegeDiamond"
  value: {
-  dps: 6078.22257
-  tps: 4844.63943
+  dps: 12232.96155
+  tps: 9798.89427
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-InvigoratingEarthsiegeDiamond"
  value: {
-  dps: 6007.67604
-  tps: 4791.13754
+  dps: 12137.76742
+  tps: 9724.59535
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Khadgar'sRegalia"
  value: {
-  dps: 6187.80936
-  tps: 4923.62851
+  dps: 9335.29131
+  tps: 7483.02136
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-KirinTorGarb"
  value: {
-  dps: 6272.15576
-  tps: 4988.85659
+  dps: 9523.50226
+  tps: 7627.21137
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Lavanthor'sTalisman-37872"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-MajesticDragonFigurine-40430"
  value: {
-  dps: 6058.93854
-  tps: 4826.9726
+  dps: 12099.49511
+  tps: 9685.96978
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-MeteoriteWhetstone-37390"
  value: {
-  dps: 5955.54448
-  tps: 4752.47757
+  dps: 12002.65187
+  tps: 9607.60452
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-NevermeltingIceCrystal-50259"
  value: {
-  dps: 6108.10792
-  tps: 4876.12174
+  dps: 12185.35279
+  tps: 9756.71566
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Nibelung-49992"
  value: {
-  dps: 6230.8402
-  tps: 4969.57344
+  dps: 12617.27832
+  tps: 10114.35882
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Nibelung-50648"
  value: {
-  dps: 6230.8402
-  tps: 4969.57344
+  dps: 12617.27832
+  tps: 10114.35882
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-OfferingofSacrifice-37638"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PersistentEarthshatterDiamond"
  value: {
-  dps: 6007.67604
-  tps: 4791.13754
+  dps: 12137.76742
+  tps: 9724.59535
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PersistentEarthsiegeDiamond"
  value: {
-  dps: 6007.67604
-  tps: 4791.13754
+  dps: 12137.76742
+  tps: 9724.59535
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PetrifiedScarab-21685"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PetrifiedTwilightScale-54571"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PowerfulEarthshatterDiamond"
  value: {
-  dps: 6007.67604
-  tps: 4791.13754
+  dps: 12137.76742
+  tps: 9724.59535
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PowerfulEarthsiegeDiamond"
  value: {
-  dps: 6007.67604
-  tps: 4791.13754
+  dps: 12137.76742
+  tps: 9724.59535
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-PurifiedShardoftheGods"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ReignoftheDead-47316"
  value: {
-  dps: 6215.75572
-  tps: 4997.49299
+  dps: 12399.74295
+  tps: 9978.21783
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ReignoftheDead-47477"
  value: {
-  dps: 6265.33816
-  tps: 5041.25052
+  dps: 12472.41141
+  tps: 10042.61285
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-RelentlessEarthsiegeDiamond"
  value: {
-  dps: 6178.91989
-  tps: 4928.13261
+  dps: 12526.04783
+  tps: 10036.35222
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-RevitalizingSkyflareDiamond"
  value: {
-  dps: 6027.17809
-  tps: 4803.71394
+  dps: 12151.25332
+  tps: 9732.51938
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-RuneofRepulsion-40372"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SealofthePantheon-36993"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ShinyShardoftheGods"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-Sindragosa'sFlawlessFang-50361"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SliverofPureIce-50339"
  value: {
-  dps: 6142.95139
-  tps: 4896.50277
+  dps: 12168.86134
+  tps: 9742.2589
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SliverofPureIce-50346"
  value: {
-  dps: 6173.94196
-  tps: 4921.60286
+  dps: 12212.74798
+  tps: 9777.62293
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SoulPreserver-37111"
  value: {
-  dps: 5970.24838
-  tps: 4763.17896
+  dps: 11974.39666
+  tps: 9585.46207
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SouloftheDead-40382"
  value: {
-  dps: 6039.16694
-  tps: 4819.16816
+  dps: 12045.4573
+  tps: 9651.20503
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SparkofLife-37657"
  value: {
-  dps: 5935.22365
-  tps: 4728.78236
+  dps: 12012.90044
+  tps: 9616.76211
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SphereofRedDragon'sBlood-37166"
  value: {
-  dps: 5958.75882
-  tps: 4753.10957
+  dps: 12253.45856
+  tps: 9815.22391
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SwiftSkyflareDiamond"
  value: {
-  dps: 6007.67604
-  tps: 4791.13754
+  dps: 12137.76742
+  tps: 9724.59535
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SwiftStarflareDiamond"
  value: {
-  dps: 6007.67604
-  tps: 4791.13754
+  dps: 12137.76742
+  tps: 9724.59535
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-SwiftWindfireDiamond"
  value: {
-  dps: 6007.67604
-  tps: 4791.13754
+  dps: 12137.76742
+  tps: 9724.59535
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TalismanofTrollDivinity-37734"
  value: {
-  dps: 5928.77542
-  tps: 4721.61316
+  dps: 11900.75202
+  tps: 9525.83573
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TearsoftheVanquished-47215"
  value: {
-  dps: 5911.06674
-  tps: 4708.4511
+  dps: 11854.20463
+  tps: 9488.62326
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TempestRegalia"
  value: {
-  dps: 4421.59066
-  tps: 3536.3822
+  dps: 6263.84318
+  tps: 5042.68569
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TheGeneral'sHeart-45507"
  value: {
-  dps: 5854.89388
-  tps: 4672.30425
+  dps: 11809.99236
+  tps: 9455.54596
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TheTwinBladesofAzzinoth"
  value: {
-  dps: 4994.5845
-  tps: 3997.60707
+  dps: 9608.49994
+  tps: 7738.56657
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-ThunderingSkyflareDiamond"
  value: {
-  dps: 6007.67604
-  tps: 4791.13754
+  dps: 12137.76742
+  tps: 9724.59535
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TinyAbominationinaJar-50351"
  value: {
-  dps: 6052.4154
-  tps: 4823.89378
+  dps: 12336.51009
+  tps: 9879.51995
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 6052.4154
-  tps: 4823.89378
+  dps: 12336.51009
+  tps: 9879.51995
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TirelessSkyflareDiamond"
  value: {
-  dps: 6045.55176
-  tps: 4820.95243
+  dps: 12191.98927
+  tps: 9767.4605
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TirelessStarflareDiamond"
  value: {
-  dps: 6037.97661
-  tps: 4814.98945
+  dps: 12181.1449
+  tps: 9758.88747
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TomeofArcanePhenomena-36972"
  value: {
-  dps: 5988.98893
-  tps: 4781.17536
+  dps: 12105.66238
+  tps: 9693.26057
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TrenchantEarthshatterDiamond"
  value: {
-  dps: 6037.97661
-  tps: 4814.98945
+  dps: 12181.1449
+  tps: 9758.88747
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-TrenchantEarthsiegeDiamond"
  value: {
-  dps: 6045.55176
-  tps: 4820.95243
+  dps: 12191.98927
+  tps: 9767.4605
  }
 }
 dps_results: {
  key: "TestFrostFire-AllItems-WingedTalisman-37844"
  value: {
-  dps: 5980.16959
-  tps: 4772.52482
+  dps: 11983.9262
+  tps: 9594.69302
  }
 }
 dps_results: {
  key: "TestFrostFire-Average-Default"
  value: {
-  dps: 6312.02709
-  tps: 5032.85528
+  dps: 12594.70061
+  tps: 10095.09701
  }
 }
 dps_results: {
- key: "TestFrostFire-Settings-Troll-P1FrostFire-Fire-Frostfire-FullBuffs-LongMultiTarget"
+ key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-Frostfire-FullBuffs-LongMultiTarget"
  value: {
-  dps: 8974.71618
-  tps: 8957.8951
+  dps: 16790.24247
+  tps: 15725.73292
  }
 }
 dps_results: {
- key: "TestFrostFire-Settings-Troll-P1FrostFire-Fire-Frostfire-FullBuffs-LongSingleTarget"
+ key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-Frostfire-FullBuffs-LongSingleTarget"
  value: {
-  dps: 6230.8402
-  tps: 4969.57344
+  dps: 12617.27832
+  tps: 10114.35882
  }
 }
 dps_results: {
- key: "TestFrostFire-Settings-Troll-P1FrostFire-Fire-Frostfire-FullBuffs-ShortSingleTarget"
+ key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-Frostfire-FullBuffs-ShortSingleTarget"
  value: {
-  dps: 7357.64835
-  tps: 5780.32654
+  dps: 14755.83852
+  tps: 11681.39844
  }
 }
 dps_results: {
- key: "TestFrostFire-Settings-Troll-P1FrostFire-Fire-Frostfire-NoBuffs-LongMultiTarget"
+ key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-Frostfire-NoBuffs-LongMultiTarget"
  value: {
-  dps: 4862.32241
-  tps: 5500.50737
+  dps: 10074.24648
+  tps: 10247.32687
  }
 }
 dps_results: {
- key: "TestFrostFire-Settings-Troll-P1FrostFire-Fire-Frostfire-NoBuffs-LongSingleTarget"
+ key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-Frostfire-NoBuffs-LongSingleTarget"
  value: {
-  dps: 2806.39455
-  tps: 2240.75332
+  dps: 6007.1619
+  tps: 4817.89668
  }
 }
 dps_results: {
- key: "TestFrostFire-Settings-Troll-P1FrostFire-Fire-Frostfire-NoBuffs-ShortSingleTarget"
+ key: "TestFrostFire-Settings-Troll-P3FrostFire-Fire-Frostfire-NoBuffs-ShortSingleTarget"
  value: {
-  dps: 3562.18094
-  tps: 2752.44214
+  dps: 7641.91815
+  tps: 5985.51808
  }
 }
 dps_results: {
  key: "TestFrostFire-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 6230.8402
-  tps: 4969.57344
+  dps: 12617.27832
+  tps: 10114.35882
  }
 }
diff --git a/sim/mage/mage_test.go b/sim/mage/mage_test.go
index bf8350978a..704d5c69fa 100644
--- a/sim/mage/mage_test.go
+++ b/sim/mage/mage_test.go
@@ -17,7 +17,7 @@ func TestArcane(t *testing.T) {
 		Class: proto.Class_ClassMage,
 		Race:  proto.Race_RaceTroll,
 
-		GearSet:     core.GearSetCombo{Label: "P1Arcane", GearSet: P1ArcaneGear},
+		GearSet:     core.GearSetCombo{Label: "P3Arcane", GearSet: P3ArcaneGear},
 		Talents:     ArcaneTalents,
 		Glyphs:      ArcaneGlyphs,
 		Consumes:    FullArcaneConsumes,
@@ -47,7 +47,7 @@ func TestFire(t *testing.T) {
 		Class: proto.Class_ClassMage,
 		Race:  proto.Race_RaceTroll,
 
-		GearSet:     core.GearSetCombo{Label: "P1Fire", GearSet: P1FireGear},
+		GearSet:     core.GearSetCombo{Label: "P3Fire", GearSet: P3FireGear},
 		Talents:     FireTalents,
 		Glyphs:      FireGlyphs,
 		Consumes:    FullFireConsumes,
@@ -77,7 +77,7 @@ func TestFrostFire(t *testing.T) {
 		Class: proto.Class_ClassMage,
 		Race:  proto.Race_RaceTroll,
 
-		GearSet:     core.GearSetCombo{Label: "P1FrostFire", GearSet: P1FireGear},
+		GearSet:     core.GearSetCombo{Label: "P3FrostFire", GearSet: P3FireGear},
 		Talents:     FrostFireTalents,
 		Glyphs:      FrostFireGlyphs,
 		Consumes:    FullFireConsumes,
@@ -104,7 +104,7 @@ func TestFrost(t *testing.T) {
 		Class: proto.Class_ClassMage,
 		Race:  proto.Race_RaceTroll,
 
-		GearSet:     core.GearSetCombo{Label: "P1Frost", GearSet: P1FrostGear},
+		GearSet:     core.GearSetCombo{Label: "P3Frost", GearSet: P3FrostGear},
 		Talents:     FrostTalents,
 		Glyphs:      FrostGlyphs,
 		Consumes:    FullFrostConsumes,
@@ -296,24 +296,24 @@ var FrostAOERotation = core.APLRotationFromJsonString(`{
 	]
 }`)
 
-var P1ArcaneGear = core.EquipmentSpecFromJsonString(`{"items": [
-	{"id":40416,"enchant":3820,"gems":[41285,39998]},
-	{"id":44661,"gems":[40026]},
-	{"id":40419,"enchant":3810,"gems":[40051]},
-	{"id":44005,"enchant":3722,"gems":[40026]},
-	{"id":44002,"enchant":3832,"gems":[39998,39998]},
-	{"id":44008,"enchant":2332,"gems":[39998,0]},
-	{"id":40415,"enchant":3604,"gems":[39998,0]},
-	{"id":40561,"gems":[39998]},
-	{"id":40417,"enchant":3719,"gems":[39998,40051]},
-	{"id":40558,"enchant":3606},
-	{"id":40719},
-	{"id":40399},
-	{"id":39229},
-	{"id":40255},
-	{"id":40396,"enchant":3834},
-	{"id":40273},
-	{"id":39426}
+var P3FireGear = core.EquipmentSpecFromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40153]},
+        {"id":50628,"enchant":3722,"gems":[40153]},
+        {"id":51283,"enchant":3832,"gems":[40113,40133]},
+        {"id":54582,"enchant":2332,"gems":[40155,0]},
+        {"id":50722,"enchant":3604,"gems":[40153,40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40153]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40153]},
+        {"id":47188},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40153]}
 ]}`)
-var P1FrostGear = P1ArcaneGear
-var P1FireGear = P1ArcaneGear
+var P3FrostGear = P3FireGear
+var P3ArcaneGear = P3FireGear
diff --git a/ui/mage/presets.ts b/ui/mage/presets.ts
index 01dc1ebe68..429c0a2963 100644
--- a/ui/mage/presets.ts
+++ b/ui/mage/presets.ts
@@ -680,6 +680,56 @@ export const FIRE_P3_PRESET_HORDE = {
     ]}`),
 };
 
+export const FIRE_P4_PRESET_ALLIANCE = {
+	name: 'Fire P4 Preset [A]',
+	enableWhen: (player: Player<Spec.SpecMage>) => player.getTalentTree() == 1 && !player.getTalents().icyVeins && player.getFaction() == Faction.Alliance,
+	tooltip: Tooltips.BASIC_BIS_DISCLAIMER,
+	gear: EquipmentSpec.fromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40152]},
+        {"id":50628,"enchant":3722,"gems":[40152]},
+        {"id":50629,"enchant":3832,"gems":[40113,40133,40155]},
+        {"id":50686,"enchant":2332,"gems":[40133,0]},
+        {"id":51280,"enchant":3604,"gems":[40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40152]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40152]},
+        {"id":50365},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40153]}
+    ]}`),
+};
+
+export const FIRE_P4_PRESET_HORDE = {
+	name: 'Fire P4 Preset [H]',
+	enableWhen: (player: Player<Spec.SpecMage>) => player.getTalentTree() == 1 && !player.getTalents().icyVeins && player.getFaction() == Faction.Horde,
+	tooltip: Tooltips.BASIC_BIS_DISCLAIMER,
+	gear: EquipmentSpec.fromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40153]},
+        {"id":50628,"enchant":3722,"gems":[40153]},
+        {"id":51283,"enchant":3832,"gems":[40113,40133]},
+        {"id":50651,"enchant":2332,"gems":[40153,0]},
+        {"id":51280,"enchant":3604,"gems":[40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40152]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40152]},
+        {"id":50365},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40153]}
+    ]}`),
+};
+
 export const FIRE_P3_PRESET_ALLIANCE = {
 	name: 'Fire P3 Preset [A]',
 	enableWhen: (player: Player<Spec.SpecMage>) => player.getTalentTree() == 1 && !player.getTalents().icyVeins && player.getFaction() == Faction.Alliance,
@@ -706,8 +756,6 @@ export const FIRE_P3_PRESET_ALLIANCE = {
 };
 
 
-
-
 export const FFB_P3_PRESET_HORDE = {
 	name: 'FFB P3 Preset [H]',
 	enableWhen: (player: Player<Spec.SpecMage>) => player.getFaction() == Faction.Horde && player.getTalentTree() == 1 && player.getTalents().icyVeins,
@@ -756,4 +804,104 @@ export const FFB_P3_PRESET_ALLIANCE = {
         {"id":47064},
         {"id":45294,"gems":[40155]}
     ]}`),
-};
\ No newline at end of file
+};
+
+export const FFB_P4_PRESET_HORDE = {
+	name: 'FFB P4 Preset [H]',
+	enableWhen: (player: Player<Spec.SpecMage>) => player.getFaction() == Faction.Horde && player.getTalentTree() == 1 && player.getTalents().icyVeins,
+	tooltip: Tooltips.BASIC_BIS_DISCLAIMER,
+	gear: EquipmentSpec.fromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40152]},
+        {"id":50628,"enchant":3722,"gems":[40152]},
+        {"id":51283,"enchant":3832,"gems":[40113,40133]},
+        {"id":50651,"enchant":2332,"gems":[40152,0]},
+        {"id":51280,"enchant":3604,"gems":[40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40152]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40152]},
+        {"id":50365},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40152]}
+    ]}`),
+};
+
+export const FFB_P4_PRESET_ALLIANCE = {
+	name: 'FFB P4 Preset [A]',
+	enableWhen: (player: Player<Spec.SpecMage>) => player.getFaction() == Faction.Alliance && player.getTalentTree() == 1 && player.getTalents().icyVeins,
+	tooltip: Tooltips.BASIC_BIS_DISCLAIMER,
+	gear: EquipmentSpec.fromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40153]},
+        {"id":50628,"enchant":3722,"gems":[40153]},
+        {"id":51283,"enchant":3832,"gems":[40113,40133]},
+        {"id":50686,"enchant":2332,"gems":[40133,0]},
+        {"id":51280,"enchant":3604,"gems":[40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40152]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40152]},
+        {"id":50365},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40152]}
+    ]}`),
+};
+
+export const ARCANE_P4_PRESET_HORDE = {
+	name: 'Arcane P4 Preset [H]',
+	enableWhen: (player: Player<Spec.SpecMage>) => player.getTalentTree() == 0 && player.getFaction() == Faction.Horde,
+	tooltip: Tooltips.BASIC_BIS_DISCLAIMER,
+	gear: EquipmentSpec.fromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40153]},
+        {"id":50628,"enchant":3722,"gems":[40153]},
+        {"id":51283,"enchant":3832,"gems":[40113,40133]},
+        {"id":54582,"enchant":2332,"gems":[40155,0]},
+        {"id":50722,"enchant":3604,"gems":[40153,40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40153]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40153]},
+        {"id":47188},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40153]}
+    ]}`),
+};
+
+export const ARCANE_P4_PRESET_ALLIANCE = {
+	name: 'Arcane P4 Preset [A]',
+	enableWhen: (player: Player<Spec.SpecMage>) => player.getTalentTree() == 0 && player.getFaction() == Faction.Alliance,
+	tooltip: Tooltips.BASIC_BIS_DISCLAIMER,
+	gear: EquipmentSpec.fromJsonString(`{"items": [
+		{"id":51281,"enchant":3820,"gems":[41285,40133]},
+        {"id":50724,"gems":[40133]},
+        {"id":51284,"enchant":3810,"gems":[40153]},
+        {"id":50628,"enchant":3722,"gems":[40153]},
+        {"id":51283,"enchant":3832,"gems":[40113,40133]},
+        {"id":54582,"enchant":2332,"gems":[40155,0]},
+        {"id":50722,"enchant":3604,"gems":[40153,40133,0]},
+        {"id":50613,"enchant":3601,"gems":[40133,40113,40113]},
+        {"id":51282,"enchant":3872,"gems":[40133,40155]},
+        {"id":50699,"enchant":3606,"gems":[40133,40113]},
+        {"id":50664,"gems":[40133]},
+        {"id":50398,"gems":[40155]},
+        {"id":47188},
+        {"id":50348},
+        {"id":50732,"enchant":3834,"gems":[40113]},
+        {"id":50719},
+        {"id":50684,"gems":[40155]}
+    ]}`),
+};
diff --git a/ui/mage/sim.ts b/ui/mage/sim.ts
index 4ba10cdddf..039c808c5a 100644
--- a/ui/mage/sim.ts
+++ b/ui/mage/sim.ts
@@ -186,6 +186,12 @@ export class MageSimUI extends IndividualSimUI<Spec.SpecMage> {
 					Presets.FIRE_P3_PRESET_HORDE,
 					Presets.FFB_P3_PRESET_ALLIANCE,
 					Presets.FFB_P3_PRESET_HORDE,
+					Presets.FIRE_P4_PRESET_HORDE,
+					Presets.FIRE_P4_PRESET_ALLIANCE,
+					Presets.FFB_P4_PRESET_HORDE,
+					Presets.FFB_P4_PRESET_ALLIANCE,
+					Presets.ARCANE_P4_PRESET_HORDE,
+					Presets.ARCANE_P4_PRESET_ALLIANCE,
 				],
 			},