diff --git a/sim/mage/arcane/TestArcane.results b/sim/mage/arcane/TestArcane.results
index ed4b54e452..1898d31fbe 100644
--- a/sim/mage/arcane/TestArcane.results
+++ b/sim/mage/arcane/TestArcane.results
@@ -4,18 +4,18 @@ character_stats_results: {
   final_stats: 126
   final_stats: 136.5
   final_stats: 29487.7
-  final_stats: 23359.77
+  final_stats: 23536.17
   final_stats: 288
-  final_stats: 4494
-  final_stats: 4846
-  final_stats: 6357
-  final_stats: 617
+  final_stats: 5112
+  final_stats: 4070
+  final_stats: 6812
+  final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 17622
   final_stats: 0
   final_stats: 0
-  final_stats: 37405.247
+  final_stats: 37599.287
   final_stats: 0
   final_stats: 0
   final_stats: 16196
@@ -23,711 +23,711 @@ character_stats_results: {
   final_stats: 559230.8
   final_stats: 300000
   final_stats: 15000
-  final_stats: 13.21765
-  final_stats: 15.03235
-  final_stats: 16.52667
-  final_stats: 23.20653
+  final_stats: 15.03529
+  final_stats: 15.03529
+  final_stats: 15.23333
+  final_stats: 21.98282
   final_stats: 0
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-AgilePrimalDiamond"
  value: {
-  dps: 222611.82544
-  tps: 215747.6482
+  dps: 243164.65105
+  tps: 234459.26754
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-AssuranceofConsequence-105472"
  value: {
-  dps: 206146.81147
-  tps: 199612.14365
+  dps: 229379.37127
+  tps: 221056.27575
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-AusterePrimalDiamond"
  value: {
-  dps: 219789.63901
-  tps: 213014.13039
+  dps: 240034.5673
+  tps: 231453.30819
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BlackBloodofY'Shaarj-105648"
  value: {
-  dps: 250708.14874
-  tps: 241227.73721
+  dps: 269145.55335
+  tps: 257511.43449
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-BurningPrimalDiamond"
  value: {
-  dps: 224166.59105
-  tps: 217260.95941
+  dps: 244804.24899
+  tps: 236058.74285
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-CapacitivePrimalDiamond"
  value: {
-  dps: 220549.46505
-  tps: 213749.51873
+  dps: 240931.58615
+  tps: 232332.70373
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ChronomancerRegalia"
  value: {
-  dps: 180118.9305
-  tps: 174519.45746
+  dps: 200376.69799
+  tps: 193145.38278
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-CourageousPrimalDiamond"
  value: {
-  dps: 222078.64489
-  tps: 215243.2964
+  dps: 242508.85456
+  tps: 233865.51592
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DelicateVialoftheSanguinaire-96895"
  value: {
-  dps: 206146.81147
-  tps: 199612.14365
+  dps: 229137.66185
+  tps: 220816.49618
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-DestructivePrimalDiamond"
  value: {
-  dps: 220920.66626
-  tps: 214115.2572
+  dps: 241177.8961
+  tps: 232577.66054
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EffulgentPrimalDiamond"
  value: {
-  dps: 219789.63901
-  tps: 213014.13039
+  dps: 240034.5673
+  tps: 231453.30819
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EmberPrimalDiamond"
  value: {
-  dps: 221318.94161
-  tps: 214502.50341
+  dps: 241645.08894
+  tps: 233024.28702
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-BloodyDancingSteel-5125"
  value: {
-  dps: 224400.88016
-  tps: 216943.72066
+  dps: 250994.19194
+  tps: 241535.24036
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-Colossus-4445"
  value: {
-  dps: 224400.88016
-  tps: 216943.72066
+  dps: 250994.19194
+  tps: 241535.24036
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-DancingSteel-4444"
  value: {
-  dps: 224400.88016
-  tps: 216943.72066
+  dps: 250994.19194
+  tps: 241535.24036
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-ElementalForce-4443"
  value: {
-  dps: 226227.78017
-  tps: 218774.6232
+  dps: 253416.0391
+  tps: 243949.13248
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-River'sSong-4446"
  value: {
-  dps: 224400.88016
-  tps: 216943.72066
+  dps: 251013.83471
+  tps: 241554.88313
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-SpiritofConquest-5124"
  value: {
-  dps: 232716.63969
-  tps: 224279.84526
+  dps: 259308.00161
+  tps: 248634.50576
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnchantWeapon-Windsong-4441"
  value: {
-  dps: 229832.51075
-  tps: 221455.16789
+  dps: 254371.22895
+  tps: 243739.80821
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EnigmaticPrimalDiamond"
  value: {
-  dps: 220920.66626
-  tps: 214115.2572
+  dps: 241177.8961
+  tps: 232577.66054
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EternalPrimalDiamond"
  value: {
-  dps: 219789.63901
-  tps: 213014.13039
+  dps: 240034.5673
+  tps: 231453.30819
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-EvilEyeofGalakras-105491"
  value: {
-  dps: 206029.83565
-  tps: 199510.56246
+  dps: 229120.85129
+  tps: 220799.68562
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-FabledFeatherofJi-Kun-96842"
  value: {
-  dps: 206337.08122
-  tps: 199818.52255
+  dps: 229110.77741
+  tps: 220789.61174
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Fen-Yu,FuryofXuen-102248"
  value: {
-  dps: 227502.51837
-  tps: 219302.16289
+  dps: 253974.42818
+  tps: 243596.30321
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-FleetPrimalDiamond"
  value: {
-  dps: 221466.43215
-  tps: 214655.0138
+  dps: 241870.30798
+  tps: 233241.41983
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ForlornPrimalDiamond"
  value: {
-  dps: 221318.94161
-  tps: 214502.50341
+  dps: 241645.08894
+  tps: 233024.28702
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-FrenziedCrystalofRage-105572"
  value: {
-  dps: 234358.37285
-  tps: 225722.5319
+  dps: 256510.29353
+  tps: 245873.8619
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Fusion-FireCore-105459"
  value: {
-  dps: 206143.79272
-  tps: 199609.1249
+  dps: 229124.36711
+  tps: 220803.20144
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-GazeoftheTwins-96915"
  value: {
-  dps: 210949.88128
-  tps: 204270.07418
+  dps: 233874.26776
+  tps: 225310.42299
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Gladiator'sRegalia"
  value: {
-  dps: 196021.40871
-  tps: 189836.71714
+  dps: 219009.18588
+  tps: 210752.45342
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Gong-Lu,StrengthofXuen-102249"
  value: {
-  dps: 227502.51837
-  tps: 219302.16289
+  dps: 253974.42818
+  tps: 243596.30321
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Haromm'sTalisman-105527"
  value: {
-  dps: 217662.08357
-  tps: 211126.73882
+  dps: 241590.32875
+  tps: 233267.45705
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Horridon'sLastGasp-96757"
  value: {
-  dps: 218587.84905
-  tps: 211693.91987
+  dps: 241891.1337
+  tps: 233214.03913
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ImpassivePrimalDiamond"
  value: {
-  dps: 220920.66626
-  tps: 214115.2572
+  dps: 241177.8961
+  tps: 232577.66054
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-IndomitablePrimalDiamond"
  value: {
-  dps: 219789.63901
-  tps: 213014.13039
+  dps: 240034.5673
+  tps: 231453.30819
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-InscribedBagofHydra-Spawn-96828"
  value: {
-  dps: 206146.81147
-  tps: 199612.14365
+  dps: 229137.66185
+  tps: 220816.49618
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Ji-Kun'sRisingWinds-96843"
  value: {
-  dps: 206146.81147
-  tps: 199612.14365
+  dps: 229137.66185
+  tps: 220816.49618
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Kardris'ToxicTotem-105540"
  value: {
-  dps: 245914.93422
-  tps: 237206.07972
+  dps: 268986.34794
+  tps: 258187.08776
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-NitroBoosts-4223"
  value: {
-  dps: 232557.30397
-  tps: 224114.39295
+  dps: 258670.4511
+  tps: 248000.05202
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PhaseFingers-4697"
  value: {
-  dps: 231861.62437
-  tps: 223436.70869
+  dps: 257852.93696
+  tps: 247205.30231
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PowerfulPrimalDiamond"
  value: {
-  dps: 219789.63901
-  tps: 213014.13039
+  dps: 240034.5673
+  tps: 231453.30819
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PriceofProgress-81266"
  value: {
-  dps: 212144.84883
-  tps: 205418.29872
+  dps: 235264.43362
+  tps: 226777.63528
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Primordius'TalismanofRage-96873"
  value: {
-  dps: 211067.47998
-  tps: 204372.89702
+  dps: 234489.4849
+  tps: 225971.30377
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-PurifiedBindingsofImmerseus-105422"
  value: {
-  dps: 243061.18689
-  tps: 234197.57683
+  dps: 269216.16226
+  tps: 258431.0084
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Qian-Le,CourageofNiuzao-102245"
  value: {
-  dps: 226274.78195
-  tps: 217969.22466
+  dps: 251896.30697
+  tps: 241629.17292
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Qian-Ying,FortitudeofNiuzao-102250"
  value: {
-  dps: 223985.96328
-  tps: 215729.66773
+  dps: 248960.90028
+  tps: 238780.04844
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RegaliaoftheBurningScroll"
  value: {
-  dps: 179122.89753
-  tps: 173329.09221
+  dps: 202824.53728
+  tps: 195139.06124
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RegaliaoftheChromaticHydra"
  value: {
-  dps: 195887.44613
-  tps: 189586.77617
+  dps: 213738.05795
+  tps: 205833.7596
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Renataki'sSoulCharm-96741"
  value: {
-  dps: 206161.99905
-  tps: 199644.21792
+  dps: 229095.00404
+  tps: 220773.83838
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ReverberatingPrimalDiamond"
  value: {
-  dps: 222611.82544
-  tps: 215747.6482
+  dps: 243164.65105
+  tps: 234459.26754
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RevitalizingPrimalDiamond"
  value: {
-  dps: 222611.82544
-  tps: 215747.6482
+  dps: 243164.65105
+  tps: 234459.26754
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-RuneofRe-Origination-96918"
  value: {
-  dps: 206699.46152
-  tps: 200190.97993
+  dps: 229427.24129
+  tps: 221088.91641
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SigilofRampage-105580"
  value: {
-  dps: 206146.81147
-  tps: 199612.14365
+  dps: 229137.66185
+  tps: 220816.49618
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SinisterPrimalDiamond"
  value: {
-  dps: 232557.30397
-  tps: 224114.39295
+  dps: 258670.4511
+  tps: 248000.05202
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Skeer'sBloodsoakedTalisman-105632"
  value: {
-  dps: 206146.81147
-  tps: 199612.14365
+  dps: 229137.66185
+  tps: 220816.49618
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SoothingTalismanoftheShado-PanAssault-94509"
  value: {
-  dps: 216758.5432
-  tps: 209960.0861
+  dps: 239990.83305
+  tps: 231431.34193
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SoulBarrier-96927"
  value: {
-  dps: 206146.81147
-  tps: 199612.14365
+  dps: 229137.66185
+  tps: 220816.49618
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SparkofZandalar-96770"
  value: {
-  dps: 210988.80063
-  tps: 204513.33079
+  dps: 231852.26732
+  tps: 223635.57995
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-SynapseSprings(MarkII)-4898"
  value: {
-  dps: 237500.32826
-  tps: 228651.01981
+  dps: 261555.12128
+  tps: 250552.28872
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TalismanofBloodlust-96864"
  value: {
-  dps: 213137.61924
-  tps: 206423.00352
+  dps: 234643.5655
+  tps: 226173.45047
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TheGloamingBlade-88149"
  value: {
-  dps: 232557.30397
-  tps: 224114.39295
+  dps: 258670.4511
+  tps: 248000.05202
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Thok'sTailTip-105609"
  value: {
-  dps: 217353.3408
-  tps: 210458.77533
+  dps: 239224.03976
+  tps: 230685.90615
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TickingEbonDetonator-105612"
  value: {
-  dps: 214916.37636
-  tps: 208233.50201
+  dps: 237003.89323
+  tps: 228453.39791
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Time-LostArtifact-103678"
  value: {
-  dps: 210324.53187
-  tps: 203700.29161
+  dps: 233788.60539
+  tps: 225347.59259
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-TyrannicalPrimalDiamond"
  value: {
-  dps: 219789.63901
-  tps: 213014.13039
+  dps: 240034.5673
+  tps: 231453.30819
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-UnerringVisionofLeiShen-96930"
  value: {
-  dps: 233306.49773
-  tps: 224739.10644
+  dps: 259846.17132
+  tps: 249055.42397
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Wushoolay'sFinalChoice-96785"
  value: {
-  dps: 229530.16406
-  tps: 221189.14387
+  dps: 254893.04214
+  tps: 244596.47807
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-Xing-Ho,BreathofYu'lon-102246"
  value: {
-  dps: 274960.55491
-  tps: 266374.88089
+  dps: 305100.67737
+  tps: 294309.43357
  }
 }
 dps_results: {
  key: "TestArcane-AllItems-ZenAlchemistStone-75274"
  value: {
-  dps: 220205.86868
-  tps: 212812.17207
+  dps: 242491.41222
+  tps: 233359.60623
  }
 }
 dps_results: {
  key: "TestArcane-Average-Default"
  value: {
-  dps: 239432.95261
-  tps: 230493.96796
+  dps: 264259.28543
+  tps: 253207.22997
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 619972.90249
-  tps: 614766.82256
+  dps: 675178.86505
+  tps: 667688.18852
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 231364.617
-  tps: 222738.59301
+  dps: 253603.15661
+  tps: 243302.48094
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 380746.95164
-  tps: 342436.85854
+  dps: 439377.041
+  tps: 393048.21377
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 442384.54623
-  tps: 445054.96119
+  dps: 477887.23514
+  tps: 480202.6157
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 164436.29273
-  tps: 162780.19194
+  dps: 176061.25803
+  tps: 174192.27323
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 212328.52939
-  tps: 207854.11417
+  dps: 239537.16126
+  tps: 234221.4402
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 475562.05831
-  tps: 455930.47933
+  dps: 524226.44105
+  tps: 498135.96219
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 222798.43421
-  tps: 214272.05548
+  dps: 245095.7344
+  tps: 234298.93951
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 366969.47397
-  tps: 329105.47364
+  dps: 430458.16563
+  tps: 381614.04363
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 315632.33654
-  tps: 316856.12978
+  dps: 346155.19269
+  tps: 347207.99866
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 155027.13856
-  tps: 153383.41933
+  dps: 169519.69812
+  tps: 167648.11317
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 199256.88263
-  tps: 194960.51485
+  dps: 231446.83775
+  tps: 226286.26741
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 768656.63926
-  tps: 759846.39979
+  dps: 840590.31781
+  tps: 828668.60077
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 228449.65299
-  tps: 219522.8699
+  dps: 252687.29394
+  tps: 241798.30374
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 373642.74311
-  tps: 333853.36828
+  dps: 438545.82409
+  tps: 389130.07597
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 547803.02257
-  tps: 548399.09433
+  dps: 599868.68084
+  tps: 600503.50777
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 160694.79038
-  tps: 158901.39284
+  dps: 173523.32523
+  tps: 171539.6462
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 207204.91785
-  tps: 202368.79104
+  dps: 237213.00076
+  tps: 231604.45442
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 433554.14475
-  tps: 438656.68184
+  dps: 481611.68198
+  tps: 484667.90871
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 97086.61008
-  tps: 91358.56424
+  dps: 111065.49656
+  tps: 103633.28029
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 319001.32722
-  tps: 289563.2736
+  dps: 378391.28594
+  tps: 340141.33192
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 314139.23696
-  tps: 325246.33528
+  dps: 338776.83812
+  tps: 349781.43805
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 61796.31008
-  tps: 61438.73595
+  dps: 69053.01777
+  tps: 68488.1005
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 180568.85468
-  tps: 177477.29016
+  dps: 208749.58442
+  tps: 204792.23695
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 534920.48366
-  tps: 540200.19673
+  dps: 572092.11243
+  tps: 576062.32467
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 183475.03581
-  tps: 178014.43562
+  dps: 200117.07401
+  tps: 193140.21294
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 304481.57228
-  tps: 278391.36856
+  dps: 360910.28199
+  tps: 327030.63508
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 388624.84748
-  tps: 398273.44792
+  dps: 417335.46129
+  tps: 427114.8788
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 129262.38558
-  tps: 128463.42936
+  dps: 139326.8264
+  tps: 138392.60739
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Orc-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 168933.04155
-  tps: 164973.61819
+  dps: 186769.0455
+  tps: 182257.01815
  }
 }
 dps_results: {
@@ -943,211 +943,211 @@ dps_results: {
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 621634.02156
-  tps: 616779.81609
+  dps: 694737.63769
+  tps: 686925.34052
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 238214.74778
-  tps: 229346.37575
+  dps: 262341.9528
+  tps: 251314.46591
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 391393.21763
-  tps: 352168.50279
+  dps: 464245.93706
+  tps: 414118.27883
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 453074.7778
-  tps: 455687.07532
+  dps: 489144.03675
+  tps: 491958.82444
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 166977.43718
-  tps: 165223.36356
+  dps: 181288.20454
+  tps: 179315.10817
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-DefaultTalents-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 217042.9424
-  tps: 212322.29802
+  dps: 250470.09508
+  tps: 244796.75564
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 483252.65289
-  tps: 464062.37433
+  dps: 536976.43537
+  tps: 509227.57655
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 226629.43934
-  tps: 217663.81638
+  dps: 249527.83749
+  tps: 238241.18496
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 379799.3833
-  tps: 340238.05342
+  dps: 443435.35433
+  tps: 392226.02459
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 325041.56041
-  tps: 326722.55359
+  dps: 356040.41733
+  tps: 357296.76652
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 157481.8138
-  tps: 155782.2235
+  dps: 172401.58054
+  tps: 170502.99984
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 206420.15156
-  tps: 201854.71256
+  dps: 234339.09395
+  tps: 228885.46311
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 786489.84876
-  tps: 777633.61466
+  dps: 862880.61149
+  tps: 850169.34929
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 229461.53525
-  tps: 220609.52097
+  dps: 255808.75645
+  tps: 244257.09717
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 375872.78357
-  tps: 336759.14509
+  dps: 449595.99897
+  tps: 397444.07478
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 549438.31164
-  tps: 550762.64143
+  dps: 603490.86596
+  tps: 604893.24459
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 163399.88504
-  tps: 161561.79626
+  dps: 177593.55653
+  tps: 175504.73168
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row5_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 214760.82218
-  tps: 209638.84729
+  dps: 240207.54569
+  tps: 234318.71049
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 445190.55271
-  tps: 450835.18652
+  dps: 491774.69422
+  tps: 494785.35885
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 98884.53382
-  tps: 93138.32249
+  dps: 113119.41617
+  tps: 105721.38287
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 329191.03582
-  tps: 299642.47013
+  dps: 389740.26709
+  tps: 351950.18814
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 316472.55988
-  tps: 328480.88085
+  dps: 342581.81981
+  tps: 354208.68661
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 61873.34285
-  tps: 61475.11659
+  dps: 69680.28691
+  tps: 69080.59584
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent1-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 181490.91408
-  tps: 178251.55969
+  dps: 212034.2313
+  tps: 207892.13442
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 535806.94768
-  tps: 541004.82798
+  dps: 588041.42511
+  tps: 592379.65854
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 183412.80609
-  tps: 178284.42228
+  dps: 202999.76647
+  tps: 196534.23042
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-FullBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 304974.44758
-  tps: 280451.4055
+  dps: 363612.71055
+  tps: 332709.25809
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongMultiTarget"
  value: {
-  dps: 389538.26373
-  tps: 401266.55098
+  dps: 417168.90256
+  tps: 428649.67141
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-LongSingleTarget"
  value: {
-  dps: 130669.98103
-  tps: 129838.2681
+  dps: 140258.40733
+  tps: 139356.62838
  }
 }
 dps_results: {
  key: "TestArcane-Settings-Troll-p3_bis-Row6_Talent3-Arcane-arcane_t15_4pc-NoBuffs-0.0yards-ShortSingleTarget"
  value: {
-  dps: 172886.23698
-  tps: 168920.83753
+  dps: 193001.30702
+  tps: 188469.12563
  }
 }
 dps_results: {
@@ -1363,7 +1363,7 @@ dps_results: {
 dps_results: {
  key: "TestArcane-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 238214.74778
-  tps: 229346.37575
+  dps: 262341.9528
+  tps: 251314.46591
  }
 }
diff --git a/ui/mage/arcane/gear_sets/p3_bis.gear.json b/ui/mage/arcane/gear_sets/p3_bis.gear.json
index c346a79e30..5e8e37f429 100644
--- a/ui/mage/arcane/gear_sets/p3_bis.gear.json
+++ b/ui/mage/arcane/gear_sets/p3_bis.gear.json
@@ -1,20 +1,20 @@
 {
       "items": [
         {"id":96635,"gems":[95347,76700],"reforging":140},
-        {"id":96453,"reforging":147,"upgradeStep":"UpgradeStepTwo"},
+        {"id":96453,"reforging":140,"upgradeStep":"UpgradeStepTwo"},
         {"id":96638,"enchant":4806,"gems":[76672,76700],"reforging":154},
         {"id":95014,"enchant":4892,"gems":[76700],"reforging":140},
-        {"id":96637,"enchant":4419,"gems":[76671,76700,76643],"reforging":138},
+        {"id":96637,"enchant":4419,"gems":[76672,76700,76643],"reforging":138},
         {"id":96452,"randomSuffix":-339,"enchant":4414,"gems":[76700,0],"upgradeStep":"UpgradeStepTwo"},
         {"id":96634,"enchant":4433,"gems":[76672,0],"reforging":145,"tinker":4898},
         {"id":96462,"gems":[76672,76700,76700],"reforging":140,"upgradeStep":"UpgradeStepTwo"},
-        {"id":95030,"enchant":4825,"gems":[76672,76700,76700],"reforging":151},
+        {"id":95030,"enchant":4825,"gems":[76672,76700,76700]},
         {"id":95004,"enchant":4429,"gems":[76700,76643],"reforging":145},
-        {"id":96529,"gems":[76643],"reforging":146,"upgradeStep":"UpgradeStepTwo"},
+        {"id":96529,"gems":[76643],"reforging":144,"upgradeStep":"UpgradeStepTwo"},
         {"id":95019,"gems":[76643],"reforging":154},
-        {"id":96516,"reforging":147,"upgradeStep":"UpgradeStepTwo"},
+        {"id":96413,"reforging":140,"upgradeStep":"UpgradeStepTwo"},
         {"id":96558,"upgradeStep":"UpgradeStepTwo"},
         {"id":96518,"enchant":4442,"gems":[76672,76700],"upgradeStep":"UpgradeStepTwo"},
-        {"id":96562,"enchant":4434,"gems":[76671],"reforging":147,"upgradeStep":"UpgradeStepTwo"}
+        {"id":96562,"enchant":4434,"gems":[76672],"reforging":147,"upgradeStep":"UpgradeStepTwo"}
       ]
 }
diff --git a/ui/mage/fire/gear_sets/p3_bis.gear.json b/ui/mage/fire/gear_sets/p3_bis.gear.json
index 32cd6e37d0..6b34f03733 100644
--- a/ui/mage/fire/gear_sets/p3_bis.gear.json
+++ b/ui/mage/fire/gear_sets/p3_bis.gear.json
@@ -3,18 +3,18 @@
         {"id":96635,"gems":[95347,76697],"reforging":137},
         {"id":96453,"reforging":140,"upgradeStep":"UpgradeStepTwo"},
         {"id":96638,"enchant":4806,"gems":[76660,76697],"reforging":154},
-        {"id":96485,"enchant":4892,"gems":[76659],"reforging":154,"upgradeStep":"UpgradeStepTwo"},
-        {"id":96637,"enchant":4419,"gems":[76660,76697,76641],"reforging":137},
+        {"id":96485,"enchant":4892,"gems":[76660],"reforging":154,"upgradeStep":"UpgradeStepTwo"},
+        {"id":96637,"enchant":4419,"gems":[76660,76697,76641],"reforging":166},
         {"id":96452,"randomSuffix":-336,"enchant":4414,"gems":[76697,0],"upgradeStep":"UpgradeStepTwo"},
         {"id":96634,"enchant":4433,"gems":[76660,0],"tinker":4898},
         {"id":94996,"gems":[76641,76641,76697],"reforging":140},
-        {"id":95030,"enchant":4825,"gems":[76659,76697,76697],"reforging":152},
+        {"id":95030,"enchant":4825,"gems":[76660,76697,76697],"reforging":152},
         {"id":95004,"enchant":4429,"gems":[76697,76641]},
         {"id":96529,"gems":[76697],"upgradeStep":"UpgradeStepTwo"},
         {"id":95019,"gems":[76641],"reforging":152},
         {"id":96516,"upgradeStep":"UpgradeStepTwo"},
         {"id":96413,"reforging":137,"upgradeStep":"UpgradeStepTwo"},
         {"id":96610,"enchant":4442,"gems":[76697,76697],"reforging":140,"upgradeStep":"UpgradeStepTwo"},
-        {"id":96562,"enchant":4434,"gems":[76659],"reforging":154,"upgradeStep":"UpgradeStepTwo"}
+        {"id":96562,"enchant":4434,"gems":[76660],"reforging":154,"upgradeStep":"UpgradeStepTwo"}
       ]
     }
diff --git a/ui/mage/frost/gear_sets/p3_bis.gear.json b/ui/mage/frost/gear_sets/p3_bis.gear.json
index 984ed026ee..c281f84e7d 100644
--- a/ui/mage/frost/gear_sets/p3_bis.gear.json
+++ b/ui/mage/frost/gear_sets/p3_bis.gear.json
@@ -5,15 +5,15 @@
         {"id":96638,"enchant":4806,"gems":[76694,76672],"reforging":147},
         {"id":96485,"enchant":4892,"gems":[76694],"reforging":147,"upgradeStep":"UpgradeStepTwo"},
         {"id":95039,"enchant":4419,"gems":[76694,76694,76694]},
-        {"id":96506,"enchant":4414,"gems":[0],"reforging":146,"upgradeStep":"UpgradeStepTwo"},
+        {"id":96506,"enchant":4414,"gems":[0],"reforging":144,"upgradeStep":"UpgradeStepTwo"},
         {"id":96634,"enchant":4430,"gems":[76694,0],"reforging":145,"tinker":4898},
         {"id":96462,"gems":[76694,76672,76694],"reforging":140,"upgradeStep":"UpgradeStepTwo"},
         {"id":96636,"enchant":4895,"gems":[76672,76682],"reforging":147},
-        {"id":95004,"enchant":4429,"gems":[76672,76682],"reforging":146},
+        {"id":95004,"enchant":4429,"gems":[76660,76682],"reforging":144},
         {"id":95019,"gems":[76682],"reforging":140},
         {"id":96529,"gems":[76682],"reforging":145,"upgradeStep":"UpgradeStepTwo"},
-        {"id":96455,"reforging":154,"upgradeStep":"UpgradeStepTwo"},
-        {"id":96413,"reforging":140,"upgradeStep":"UpgradeStepTwo"},
+        {"id":96785,"reforging":140},
+        {"id":96827,"reforging":154},
         {"id":96404,"enchant":4442,"gems":[76682,76694],"reforging":147,"upgradeStep":"UpgradeStepTwo"},
         {"id":96562,"enchant":4434,"gems":[76694],"reforging":147,"upgradeStep":"UpgradeStepTwo"}
       ]