diff --git a/sim/shaman/elemental/TestElemental.results b/sim/shaman/elemental/TestElemental.results
index f56f006f8..2c1e8fc3f 100644
--- a/sim/shaman/elemental/TestElemental.results
+++ b/sim/shaman/elemental/TestElemental.results
@@ -27,7 +27,7 @@ character_stats_results: {
   final_stats: 6173.5
   final_stats: 0
   final_stats: 0
-  final_stats: 2359.7
+  final_stats: 2505.7
   final_stats: 440
   final_stats: 0
   final_stats: 5
@@ -53,9 +53,9 @@ character_stats_results: {
   final_stats: 219.65
   final_stats: 194.35
   final_stats: 435.1025
-  final_stats: 330.05
+  final_stats: 311.65
   final_stats: 259.9
-  final_stats: 525
+  final_stats: 541
   final_stats: 0
   final_stats: 40
   final_stats: 0
@@ -64,7 +64,7 @@ character_stats_results: {
   final_stats: 0
   final_stats: 50.25
   final_stats: 3
-  final_stats: 33.87785
+  final_stats: 33.56689
   final_stats: 0
   final_stats: 0
   final_stats: 1220.3
@@ -73,10 +73,10 @@ character_stats_results: {
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 6190.75
+  final_stats: 5914.75
   final_stats: 0
   final_stats: 0
-  final_stats: 2097.7
+  final_stats: 2243.7
   final_stats: 440
   final_stats: 0
   final_stats: 5
@@ -347,18 +347,18 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.92765
+  weights: -0.16177
   weights: 0
-  weights: 0.60594
+  weights: 0.60301
   weights: 0
-  weights: 0.04474
+  weights: 0.04462
   weights: 0
   weights: 0
-  weights: 0.5612
+  weights: 0.55839
   weights: 0
   weights: 0
-  weights: 8.57597
-  weights: 3.53219
+  weights: 8.89971
+  weights: 3.90675
   weights: 0
   weights: 0
   weights: 0
@@ -764,8 +764,8 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Phase2-AllItems-GiftoftheGatheringStorm"
  value: {
-  dps: 606.34918
-  tps: 576.93152
+  dps: 608.27694
+  tps: 578.92606
  }
 }
 dps_results: {
@@ -813,99 +813,99 @@ dps_results: {
 dps_results: {
  key: "TestElemental-Phase2-Average-Default"
  value: {
-  dps: 643.31149
-  tps: 613.74358
+  dps: 651.04556
+  tps: 620.39528
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-Settings-Orc-phase_2-Adaptive-default-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 1353.09812
-  tps: 1087.40849
+  dps: 1378.42474
+  tps: 1089.9339
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-Settings-Orc-phase_2-Adaptive-default-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 608.77719
-  tps: 585.93008
+  dps: 615.65378
+  tps: 591.76027
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-Settings-Orc-phase_2-Adaptive-default-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 846.50563
-  tps: 844.73194
+  dps: 855.39925
+  tps: 853.10241
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-Settings-Orc-phase_2-Adaptive-default-NoBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 771.30503
-  tps: 657.45252
+  dps: 771.11154
+  tps: 667.84185
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-Settings-Orc-phase_2-Adaptive-default-NoBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 345.80828
-  tps: 341.27118
+  dps: 349.85062
+  tps: 346.97245
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-Settings-Orc-phase_2-Adaptive-default-NoBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 604.35403
-  tps: 614.39738
+  dps: 601.47558
+  tps: 611.15516
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-Settings-Troll-phase_2-Adaptive-default-FullBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 1338.11525
-  tps: 1054.30294
+  dps: 1322.2849
+  tps: 1050.66805
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-Settings-Troll-phase_2-Adaptive-default-FullBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 604.87468
-  tps: 572.3523
+  dps: 613.88839
+  tps: 583.88842
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-Settings-Troll-phase_2-Adaptive-default-FullBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 852.41989
-  tps: 824.17722
+  dps: 860.13664
+  tps: 831.1871
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-Settings-Troll-phase_2-Adaptive-default-NoBuffs-P2-Consumes-LongMultiTarget"
  value: {
-  dps: 764.56877
-  tps: 646.59041
+  dps: 760.9245
+  tps: 649.15428
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-Settings-Troll-phase_2-Adaptive-default-NoBuffs-P2-Consumes-LongSingleTarget"
  value: {
-  dps: 335.30034
-  tps: 327.62742
+  dps: 335.21413
+  tps: 325.798
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-Settings-Troll-phase_2-Adaptive-default-NoBuffs-P2-Consumes-ShortSingleTarget"
  value: {
-  dps: 584.80047
-  tps: 571.12048
+  dps: 591.29619
+  tps: 577.1965
  }
 }
 dps_results: {
  key: "TestElemental-Phase2-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 641.14883
-  tps: 612.12616
+  dps: 651.0736
+  tps: 621.76694
  }
 }
 dps_results: {
diff --git a/sim/shaman/enhancement/TestEnhancement.results b/sim/shaman/enhancement/TestEnhancement.results
index a449a4d08..b299d62cb 100644
--- a/sim/shaman/enhancement/TestEnhancement.results
+++ b/sim/shaman/enhancement/TestEnhancement.results
@@ -1,10 +1,10 @@
 character_stats_results: {
  key: "TestEnhancement-Phase1-CharacterStats-Default"
  value: {
-  final_stats: 395.6
-  final_stats: 351.9
-  final_stats: 499.905
-  final_stats: 231.15
+  final_stats: 363.4
+  final_stats: 313.95
+  final_stats: 510.485
+  final_stats: 192.05
   final_stats: 212.75
   final_stats: 150
   final_stats: 0
@@ -15,29 +15,176 @@ character_stats_results: {
   final_stats: 0
   final_stats: 41.25
   final_stats: 3
-  final_stats: 28.20644
+  final_stats: 26.54565
   final_stats: 0
   final_stats: 0
-  final_stats: 1804.2
-  final_stats: 10
-  final_stats: 48.57652
+  final_stats: 1829.8
+  final_stats: 11
+  final_stats: 47.64866
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 4942.6125
+  final_stats: 4326.7875
   final_stats: 0
   final_stats: 0
-  final_stats: 3263.8
-  final_stats: 672
+  final_stats: 2600.9
+  final_stats: 762
+  final_stats: 0
+  final_stats: 5
+  final_stats: 0
+  final_stats: 17.64866
+  final_stats: 5
+  final_stats: 0
+  final_stats: 6647.85
+  final_stats: 27
+  final_stats: 110
+  final_stats: 60
+  final_stats: 60
+  final_stats: 60
+  final_stats: 384
+  final_stats: 0
+  final_stats: 35
+  final_stats: 0
+ }
+}
+character_stats_results: {
+ key: "TestEnhancement-Phase2-CharacterStats-Default"
+ value: {
+  final_stats: 357.65
+  final_stats: 313.95
+  final_stats: 514.4525
+  final_stats: 192.05
+  final_stats: 212.75
+  final_stats: 150
+  final_stats: 0
+  final_stats: 40
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 41.25
+  final_stats: 3
+  final_stats: 26.54565
+  final_stats: 0
+  final_stats: 0
+  final_stats: 1804.3
+  final_stats: 12
+  final_stats: 47.64866
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 4326.7875
+  final_stats: 0
+  final_stats: 0
+  final_stats: 2600.9
+  final_stats: 748
+  final_stats: 0
+  final_stats: 5
+  final_stats: 0
+  final_stats: 17.64866
+  final_stats: 5
+  final_stats: 0
+  final_stats: 6687.525
+  final_stats: 27
+  final_stats: 110
+  final_stats: 60
+  final_stats: 60
+  final_stats: 60
+  final_stats: 384
+  final_stats: 0
+  final_stats: 35
+  final_stats: 0
+ }
+}
+character_stats_results: {
+ key: "TestEnhancement-Phase3-CharacterStats-Default"
+ value: {
+  final_stats: 404.8
+  final_stats: 339.25
+  final_stats: 544.87
+  final_stats: 249.55
+  final_stats: 240.35
+  final_stats: 197
+  final_stats: 0
+  final_stats: 40
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 41.25
+  final_stats: 3
+  final_stats: 28.5174
+  final_stats: 0
+  final_stats: 0
+  final_stats: 1916.6
+  final_stats: 9
+  final_stats: 44.9339
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 5232.4125
+  final_stats: 0
+  final_stats: 0
+  final_stats: 3419.5
+  final_stats: 766
+  final_stats: 0
+  final_stats: 5
+  final_stats: 0
+  final_stats: 19.9339
+  final_stats: 5
+  final_stats: 0
+  final_stats: 6991.7
+  final_stats: 27
+  final_stats: 105
+  final_stats: 65
+  final_stats: 65
+  final_stats: 65
+  final_stats: 384
+  final_stats: 0
+  final_stats: 35
+  final_stats: 0
+ }
+}
+character_stats_results: {
+ key: "TestEnhancement-Phase5-CharacterStats-Default"
+ value: {
+  final_stats: 440.45
+  final_stats: 405.95
+  final_stats: 579.255
+  final_stats: 216.2
+  final_stats: 212.75
+  final_stats: 169
+  final_stats: 0
+  final_stats: 40
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 0
+  final_stats: 46.25
   final_stats: 3
-  final_stats: 5.12
+  final_stats: 27.95378
+  final_stats: 0
+  final_stats: 0
+  final_stats: 2049.9
+  final_stats: 7
+  final_stats: 49.32226
   final_stats: 0
-  final_stats: 19.69652
-  final_stats: 5.12
   final_stats: 0
-  final_stats: 6542.05
+  final_stats: 0
+  final_stats: 4707.15
+  final_stats: 0
+  final_stats: 0
+  final_stats: 3275.9
+  final_stats: 828
+  final_stats: 0
+  final_stats: 5
+  final_stats: 0
+  final_stats: 23.32226
+  final_stats: 5
+  final_stats: 0
+  final_stats: 7335.55
   final_stats: 27
-  final_stats: 115
+  final_stats: 75
   final_stats: 65
   final_stats: 65
   final_stats: 65
@@ -50,12 +197,132 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestEnhancement-Phase1-StatWeights-Default"
  value: {
-  weights: 0.56943
-  weights: 0.58925
+  weights: 0.56418
+  weights: 0.49076
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0.08203
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0.2453
+  weights: 0
+  weights: 7.53241
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+ }
+}
+stat_weights_results: {
+ key: "TestEnhancement-Phase2-StatWeights-Default"
+ value: {
+  weights: 0.56418
+  weights: 0.48679
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0.08203
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0.2453
+  weights: 0
+  weights: 7.47158
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+ }
+}
+stat_weights_results: {
+ key: "TestEnhancement-Phase3-StatWeights-Default"
+ value: {
+  weights: 0.56684
+  weights: 0.45891
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0.08449
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0.24645
+  weights: 0
+  weights: 8.3557
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.08316
   weights: 0
   weights: 0
   weights: 0
@@ -67,9 +334,36 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.24758
   weights: 0
-  weights: 6.61149
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+ }
+}
+stat_weights_results: {
+ key: "TestEnhancement-Phase5-StatWeights-Default"
+ value: {
+  weights: 0.57297
+  weights: 0.51262
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0.08513
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0
+  weights: 0.24912
+  weights: 10.25882
+  weights: 8.30461
   weights: 0
   weights: 0
   weights: 0
@@ -99,29 +393,29 @@ stat_weights_results: {
 dps_results: {
  key: "TestEnhancement-Phase1-AllItems-Champion'sEarthshaker"
  value: {
-  dps: 748.64414
-  tps: 758.24387
+  dps: 743.62535
+  tps: 752.89986
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-AllItems-Champion'sStormcaller"
  value: {
-  dps: 753.55011
-  tps: 763.36304
+  dps: 751.90347
+  tps: 761.35131
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-AllItems-GiftoftheGatheringStorm"
  value: {
-  dps: 661.47085
-  tps: 682.80298
+  dps: 668.6901
+  tps: 688.88543
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-AllItems-Stormcaller'sGarb"
  value: {
-  dps: 801.64895
-  tps: 811.63984
+  dps: 796.03648
+  tps: 805.14404
  }
 }
 dps_results: {
@@ -155,189 +449,924 @@ dps_results: {
 dps_results: {
  key: "TestEnhancement-Phase1-AllItems-Warlord'sEarthshaker"
  value: {
-  dps: 782.61583
-  tps: 793.63776
+  dps: 787.67791
+  tps: 798.23427
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Average-Default"
  value: {
-  dps: 852.87547
-  tps: 865.93792
+  dps: 849.07151
+  tps: 862.64555
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Auto-default-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 133.25088
-  tps: 433.80311
+  dps: 129.41961
+  tps: 430.38643
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Auto-default-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 119.41311
-  tps: 120.43394
+  dps: 115.32222
+  tps: 116.69774
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Auto-default-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 228.13693
-  tps: 307.1486
+  dps: 222.93823
+  tps: 296.61424
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Auto-default-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 65.41902
-  tps: 352.69885
+  dps: 65.9341
+  tps: 353.8537
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Auto-default-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 58.19693
-  tps: 64.69372
+  dps: 57.88044
+  tps: 64.73056
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Auto-default-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 127.99986
-  tps: 183.17126
+  dps: 123.78229
+  tps: 174.37227
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Delay OH-default-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 133.25088
-  tps: 433.80311
+  dps: 129.41961
+  tps: 430.38643
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Delay OH-default-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 119.41311
-  tps: 120.43394
+  dps: 115.32222
+  tps: 116.69774
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Delay OH-default-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 228.13693
-  tps: 307.1486
+  dps: 222.93823
+  tps: 296.61424
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Delay OH-default-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 65.41902
-  tps: 352.69885
+  dps: 65.9341
+  tps: 353.8537
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Delay OH-default-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 58.19693
-  tps: 64.69372
+  dps: 57.88044
+  tps: 64.73056
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Orc-phase_1-Sync Delay OH-default-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 127.99986
-  tps: 183.17126
+  dps: 123.78229
+  tps: 174.37227
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Auto-default-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 129.71412
-  tps: 430.11079
+  dps: 126.30401
+  tps: 424.88523
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Auto-default-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 115.43164
-  tps: 115.98262
+  dps: 111.83301
+  tps: 111.27526
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Auto-default-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 222.99425
-  tps: 299.87783
+  dps: 213.84058
+  tps: 280.80756
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Auto-default-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 66.29345
-  tps: 353.2895
+  dps: 63.81033
+  tps: 349.92139
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Auto-default-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 57.26315
-  tps: 63.16844
+  dps: 56.22096
+  tps: 61.0631
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Auto-default-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 124.98641
-  tps: 179.07219
+  dps: 119.91791
+  tps: 168.45446
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Delay OH-default-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 129.71412
-  tps: 430.11079
+  dps: 126.30401
+  tps: 424.88523
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Delay OH-default-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 115.43164
-  tps: 115.98262
+  dps: 111.83301
+  tps: 111.27526
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Delay OH-default-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 222.99425
-  tps: 299.87783
+  dps: 213.84058
+  tps: 280.80756
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Delay OH-default-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 66.29345
-  tps: 353.2895
+  dps: 63.81033
+  tps: 349.92139
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Delay OH-default-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 57.26315
-  tps: 63.16844
+  dps: 56.22096
+  tps: 61.0631
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-Settings-Troll-phase_1-Sync Delay OH-default-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 124.98641
-  tps: 179.07219
+  dps: 119.91791
+  tps: 168.45446
  }
 }
 dps_results: {
  key: "TestEnhancement-Phase1-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 645.70323
-  tps: 656.64516
+  dps: 648.26824
+  tps: 658.49856
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-AllItems-Champion'sEarthshaker"
+ value: {
+  dps: 749.82043
+  tps: 760.25422
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-AllItems-Champion'sStormcaller"
+ value: {
+  dps: 758.50811
+  tps: 768.11669
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-AllItems-GiftoftheGatheringStorm"
+ value: {
+  dps: 662.80354
+  tps: 682.99887
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-AllItems-Stormcaller'sGarb"
+ value: {
+  dps: 806.46801
+  tps: 816.27691
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-AllItems-TheEarthfury"
+ value: {
+  dps: 688.77104
+  tps: 705.31719
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-AllItems-TheEarthshatterer"
+ value: {
+  dps: 686.61225
+  tps: 729.80751
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-AllItems-TheFiveThunders"
+ value: {
+  dps: 719.08841
+  tps: 730.42409
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-AllItems-TheTenStorms"
+ value: {
+  dps: 692.39216
+  tps: 706.28276
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-AllItems-Warlord'sEarthshaker"
+ value: {
+  dps: 796.53441
+  tps: 807.67132
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Average-Default"
+ value: {
+  dps: 842.81039
+  tps: 856.38443
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Orc-phase_2-Sync Auto-default-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 128.88115
+  tps: 429.84797
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Orc-phase_2-Sync Auto-default-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 114.78376
+  tps: 116.15928
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Orc-phase_2-Sync Auto-default-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 222.02111
+  tps: 295.69712
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Orc-phase_2-Sync Auto-default-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 65.67151
+  tps: 353.5911
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Orc-phase_2-Sync Auto-default-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 57.61784
+  tps: 64.46797
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Orc-phase_2-Sync Auto-default-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 123.19657
+  tps: 173.78655
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Orc-phase_2-Sync Delay OH-default-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 128.88115
+  tps: 429.84797
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Orc-phase_2-Sync Delay OH-default-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 114.78376
+  tps: 116.15928
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Orc-phase_2-Sync Delay OH-default-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 222.02111
+  tps: 295.69712
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Orc-phase_2-Sync Delay OH-default-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 65.67151
+  tps: 353.5911
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Orc-phase_2-Sync Delay OH-default-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 57.61784
+  tps: 64.46797
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Orc-phase_2-Sync Delay OH-default-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 123.19657
+  tps: 173.78655
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Troll-phase_2-Sync Auto-default-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 125.7862
+  tps: 424.36741
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Troll-phase_2-Sync Auto-default-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 111.3152
+  tps: 110.75745
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Troll-phase_2-Sync Auto-default-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 212.95718
+  tps: 279.92415
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Troll-phase_2-Sync Auto-default-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 63.54981
+  tps: 349.66088
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Troll-phase_2-Sync Auto-default-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 55.96044
+  tps: 60.80258
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Troll-phase_2-Sync Auto-default-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 119.35136
+  tps: 167.88791
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Troll-phase_2-Sync Delay OH-default-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 125.7862
+  tps: 424.36741
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Troll-phase_2-Sync Delay OH-default-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 111.3152
+  tps: 110.75745
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Troll-phase_2-Sync Delay OH-default-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 212.95718
+  tps: 279.92415
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Troll-phase_2-Sync Delay OH-default-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 63.54981
+  tps: 349.66088
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Troll-phase_2-Sync Delay OH-default-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 55.96044
+  tps: 60.80258
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-Settings-Troll-phase_2-Sync Delay OH-default-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 119.35136
+  tps: 167.88791
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase2-SwitchInFrontOfTarget-Default"
+ value: {
+  dps: 643.52654
+  tps: 653.75686
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-AllItems-Champion'sEarthshaker"
+ value: {
+  dps: 764.09061
+  tps: 773.31659
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-AllItems-Champion'sStormcaller"
+ value: {
+  dps: 775.04629
+  tps: 784.78419
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-AllItems-GiftoftheGatheringStorm"
+ value: {
+  dps: 689.61297
+  tps: 713.6902
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-AllItems-Stormcaller'sGarb"
+ value: {
+  dps: 836.73431
+  tps: 846.66592
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-AllItems-TheEarthfury"
+ value: {
+  dps: 708.4423
+  tps: 725.40576
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-AllItems-TheEarthshatterer"
+ value: {
+  dps: 716.24442
+  tps: 759.25417
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-AllItems-TheFiveThunders"
+ value: {
+  dps: 735.59879
+  tps: 746.69072
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-AllItems-TheTenStorms"
+ value: {
+  dps: 711.20325
+  tps: 724.87096
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-AllItems-Warlord'sEarthshaker"
+ value: {
+  dps: 813.21404
+  tps: 823.63988
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Average-Default"
+ value: {
+  dps: 904.44812
+  tps: 916.78668
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Orc-phase_3-Sync Auto-default-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 141.04837
+  tps: 440.39981
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Orc-phase_3-Sync Auto-default-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 125.13841
+  tps: 124.75685
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Orc-phase_3-Sync Auto-default-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 234.44123
+  tps: 314.42615
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Orc-phase_3-Sync Auto-default-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 69.0176
+  tps: 354.93024
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Orc-phase_3-Sync Auto-default-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 59.97471
+  tps: 65.22649
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Orc-phase_3-Sync Auto-default-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 132.17671
+  tps: 189.76824
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Orc-phase_3-Sync Delay OH-default-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 141.04837
+  tps: 440.39981
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Orc-phase_3-Sync Delay OH-default-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 125.13841
+  tps: 124.75685
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Orc-phase_3-Sync Delay OH-default-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 234.44123
+  tps: 314.42615
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Orc-phase_3-Sync Delay OH-default-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 69.0176
+  tps: 354.93024
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Orc-phase_3-Sync Delay OH-default-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 59.97471
+  tps: 65.22649
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Orc-phase_3-Sync Delay OH-default-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 132.17671
+  tps: 189.76824
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Troll-phase_3-Sync Auto-default-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 138.24889
+  tps: 438.28628
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Troll-phase_3-Sync Auto-default-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 122.43142
+  tps: 122.4722
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Troll-phase_3-Sync Auto-default-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 231.84946
+  tps: 312.06076
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Troll-phase_3-Sync Auto-default-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 70.5866
+  tps: 356.70389
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Troll-phase_3-Sync Auto-default-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 60.97016
+  tps: 66.05679
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Troll-phase_3-Sync Auto-default-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 131.06869
+  tps: 188.82655
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Troll-phase_3-Sync Delay OH-default-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 138.24889
+  tps: 438.28628
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Troll-phase_3-Sync Delay OH-default-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 122.43142
+  tps: 122.4722
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Troll-phase_3-Sync Delay OH-default-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 231.84946
+  tps: 312.06076
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Troll-phase_3-Sync Delay OH-default-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 70.5866
+  tps: 356.70389
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Troll-phase_3-Sync Delay OH-default-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 60.97016
+  tps: 66.05679
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-Settings-Troll-phase_3-Sync Delay OH-default-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 131.06869
+  tps: 188.82655
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase3-SwitchInFrontOfTarget-Default"
+ value: {
+  dps: 699.9359
+  tps: 709.42233
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-AllItems-Champion'sEarthshaker"
+ value: {
+  dps: 802.57129
+  tps: 815.37932
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-AllItems-Champion'sStormcaller"
+ value: {
+  dps: 810.95456
+  tps: 823.07541
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-AllItems-GiftoftheGatheringStorm"
+ value: {
+  dps: 702.39523
+  tps: 725.56688
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-AllItems-Stormcaller'sGarb"
+ value: {
+  dps: 868.0597
+  tps: 881.66809
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-AllItems-TheEarthfury"
+ value: {
+  dps: 727.16535
+  tps: 747.61348
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-AllItems-TheEarthshatterer"
+ value: {
+  dps: 733.38731
+  tps: 779.37819
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-AllItems-TheFiveThunders"
+ value: {
+  dps: 756.725
+  tps: 770.68791
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-AllItems-TheTenStorms"
+ value: {
+  dps: 731.04641
+  tps: 748.71455
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-AllItems-Warlord'sEarthshaker"
+ value: {
+  dps: 842.89628
+  tps: 857.80434
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Average-Default"
+ value: {
+  dps: 946.78944
+  tps: 961.43368
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Orc-phase_5-Sync Auto-default-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 138.04176
+  tps: 439.38025
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Orc-phase_5-Sync Auto-default-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 123.20818
+  tps: 124.53145
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Orc-phase_5-Sync Auto-default-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 234.1865
+  tps: 313.47595
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Orc-phase_5-Sync Auto-default-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 68.83629
+  tps: 356.74791
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Orc-phase_5-Sync Auto-default-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 60.39798
+  tps: 67.47668
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Orc-phase_5-Sync Auto-default-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 133.33885
+  tps: 189.74869
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Orc-phase_5-Sync Delay OH-default-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 138.04176
+  tps: 439.38025
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Orc-phase_5-Sync Delay OH-default-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 123.20818
+  tps: 124.53145
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Orc-phase_5-Sync Delay OH-default-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 234.1865
+  tps: 313.47595
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Orc-phase_5-Sync Delay OH-default-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 68.83629
+  tps: 356.74791
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Orc-phase_5-Sync Delay OH-default-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 60.39798
+  tps: 67.47668
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Orc-phase_5-Sync Delay OH-default-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 133.33885
+  tps: 189.74869
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Troll-phase_5-Sync Auto-default-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 132.88315
+  tps: 433.113
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Troll-phase_5-Sync Auto-default-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 117.7495
+  tps: 118.74333
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Troll-phase_5-Sync Auto-default-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 227.42076
+  tps: 304.01119
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Troll-phase_5-Sync Auto-default-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 68.1635
+  tps: 355.12638
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Troll-phase_5-Sync Auto-default-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 59.3812
+  tps: 65.09944
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Troll-phase_5-Sync Auto-default-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 128.20679
+  tps: 183.20978
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Troll-phase_5-Sync Delay OH-default-FullBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 132.88315
+  tps: 433.113
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Troll-phase_5-Sync Delay OH-default-FullBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 117.7495
+  tps: 118.74333
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Troll-phase_5-Sync Delay OH-default-FullBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 227.42076
+  tps: 304.01119
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Troll-phase_5-Sync Delay OH-default-NoBuffs-P1-Consumes-LongMultiTarget"
+ value: {
+  dps: 68.1635
+  tps: 355.12638
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Troll-phase_5-Sync Delay OH-default-NoBuffs-P1-Consumes-LongSingleTarget"
+ value: {
+  dps: 59.3812
+  tps: 65.09944
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-Settings-Troll-phase_5-Sync Delay OH-default-NoBuffs-P1-Consumes-ShortSingleTarget"
+ value: {
+  dps: 128.20679
+  tps: 183.20978
+ }
+}
+dps_results: {
+ key: "TestEnhancement-Phase5-SwitchInFrontOfTarget-Default"
+ value: {
+  dps: 712.80951
+  tps: 724.90678
  }
 }
diff --git a/sim/shaman/enhancement/enhancement_test.go b/sim/shaman/enhancement/enhancement_test.go
index 07b77f614..dcf0d8ee6 100644
--- a/sim/shaman/enhancement/enhancement_test.go
+++ b/sim/shaman/enhancement/enhancement_test.go
@@ -30,6 +30,66 @@ func TestEnhancement(t *testing.T) {
 				{Label: "Sync Delay OH", SpecOptions: PlayerOptionsSyncDelayOH},
 			},
 
+			ItemFilter:      ItemFilters,
+			EPReferenceStat: proto.Stat_StatAttackPower,
+			StatsToWeigh:    Stats,
+		},
+		{
+			Class:      proto.Class_ClassShaman,
+			Phase:      2,
+			Race:       proto.Race_RaceTroll,
+			OtherRaces: []proto.Race{proto.Race_RaceOrc},
+
+			Talents:     DefaultTalents,
+			GearSet:     core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "phase_2"),
+			Rotation:    core.GetAplRotation("../../../ui/enhancement_shaman/apls", "default"),
+			Buffs:       core.FullBuffs,
+			Consumes:    Phase1Consumes,
+			SpecOptions: core.SpecOptionsCombo{Label: "Sync Auto", SpecOptions: PlayerOptionsSyncAuto},
+			OtherSpecOptions: []core.SpecOptionsCombo{
+				{Label: "Sync Delay OH", SpecOptions: PlayerOptionsSyncDelayOH},
+			},
+
+			ItemFilter:      ItemFilters,
+			EPReferenceStat: proto.Stat_StatAttackPower,
+			StatsToWeigh:    Stats,
+		},
+		{
+			Class:      proto.Class_ClassShaman,
+			Phase:      3,
+			Race:       proto.Race_RaceTroll,
+			OtherRaces: []proto.Race{proto.Race_RaceOrc},
+
+			Talents:     DefaultTalents,
+			GearSet:     core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "phase_3"),
+			Rotation:    core.GetAplRotation("../../../ui/enhancement_shaman/apls", "default"),
+			Buffs:       core.FullBuffs,
+			Consumes:    Phase1Consumes,
+			SpecOptions: core.SpecOptionsCombo{Label: "Sync Auto", SpecOptions: PlayerOptionsSyncAuto},
+			OtherSpecOptions: []core.SpecOptionsCombo{
+				{Label: "Sync Delay OH", SpecOptions: PlayerOptionsSyncDelayOH},
+			},
+
+			ItemFilter:      ItemFilters,
+			EPReferenceStat: proto.Stat_StatAttackPower,
+			StatsToWeigh:    Stats,
+		},
+		{
+			Class:      proto.Class_ClassShaman,
+			Phase:      5,
+			Race:       proto.Race_RaceTroll,
+			OtherRaces: []proto.Race{proto.Race_RaceOrc},
+
+			Talents:     DefaultTalents,
+			GearSet:     core.GetGearSet("../../../ui/enhancement_shaman/gear_sets", "phase_5"),
+			Rotation:    core.GetAplRotation("../../../ui/enhancement_shaman/apls", "default"),
+			Buffs:       core.FullBuffs,
+			Consumes:    Phase1Consumes,
+			SpecOptions: core.SpecOptionsCombo{Label: "Sync Auto", SpecOptions: PlayerOptionsSyncAuto},
+			OtherSpecOptions: []core.SpecOptionsCombo{
+				{Label: "Sync Delay OH", SpecOptions: PlayerOptionsSyncDelayOH},
+			},
+
 			ItemFilter:      ItemFilters,
 			EPReferenceStat: proto.Stat_StatAttackPower,
 			StatsToWeigh:    Stats,
diff --git a/ui/enhancement_shaman/gear_sets/phase_1.gear.json b/ui/enhancement_shaman/gear_sets/phase_1.gear.json
index f0cbd22cb..b275f3383 100644
--- a/ui/enhancement_shaman/gear_sets/phase_1.gear.json
+++ b/ui/enhancement_shaman/gear_sets/phase_1.gear.json
@@ -1,21 +1,21 @@
 {
-    "items": [
-      {"id":18817,"enchant":1506},
-      {"id":18404},
-      {"id":12927},
-      {"id":13340,"enchant":849},
-      {"id":11726,"enchant":1891},
-      {"id":18812,"enchant":1885},
-      {"id":19157,"enchant":927},
-      {"id":14614},
-      {"id":14612,"enchant":1506},
-      {"id":14616,"enchant":911},
-      {"id":18821},
-      {"id":17063},
-      {"id":11815},
-      {"id":13965},
-      {"id":17182,"enchant":2563},
-      {},
-      {}
-    ]
-  }
\ No newline at end of file
+  "items": [
+    {"id":18817,"enchant":1506},
+    {"id":18404},
+    {"id":12927},
+    {"id":13340,"enchant":849},
+    {"id":11726,"enchant":1891},
+    {"id":18812,"enchant":1885},
+    {"id":15063,"enchant":927},
+    {"id":11686},
+    {"id":15062,"enchant":1506},
+    {"id":13210,"enchant":911},
+    {"id":18821},
+    {"id":17063},
+    {"id":11815},
+    {"id":13965},
+    {"id":17182,"enchant":2563},
+    {},
+    {}
+  ]
+}
diff --git a/ui/enhancement_shaman/gear_sets/phase_2.gear.json b/ui/enhancement_shaman/gear_sets/phase_2.gear.json
new file mode 100644
index 000000000..d6d129fa6
--- /dev/null
+++ b/ui/enhancement_shaman/gear_sets/phase_2.gear.json
@@ -0,0 +1,21 @@
+{
+    "items": [
+      {"id":18817,"enchant":1506},
+      {"id":18404},
+      {"id":12927},
+      {"id":13340,"enchant":849},
+      {"id":11726,"enchant":1891},
+      {"id":18812,"enchant":1885},
+      {"id":15063,"enchant":927},
+      {"id":11686},
+      {"id":15062,"enchant":1506},
+      {"id":13210,"enchant":911},
+      {"id":19325},
+      {"id":17063},
+      {"id":11815},
+      {"id":13965},
+      {"id":17182,"enchant":2563},
+      {},
+      {}
+    ]
+}
diff --git a/ui/enhancement_shaman/gear_sets/phase_3.gear.json b/ui/enhancement_shaman/gear_sets/phase_3.gear.json
new file mode 100644
index 000000000..1b431d168
--- /dev/null
+++ b/ui/enhancement_shaman/gear_sets/phase_3.gear.json
@@ -0,0 +1,21 @@
+{
+    "items": [
+      {"id":18817,"enchant":2543},
+      {"id":19377},
+      {"id":16580},
+      {"id":19436,"enchant":849},
+      {"id":11726,"enchant":1891},
+      {"id":19587,"enchant":1885},
+      {"id":19157,"enchant":931},
+      {"id":19393},
+      {"id":22750,"enchant":2543},
+      {"id":19381,"enchant":911},
+      {"id":18821},
+      {"id":19384},
+      {"id":19406},
+      {"id":11815},
+      {"id":17182,"enchant":1900},
+      {},
+      {}
+    ]
+}
diff --git a/ui/enhancement_shaman/gear_sets/phase_5.gear.json b/ui/enhancement_shaman/gear_sets/phase_5.gear.json
new file mode 100644
index 000000000..161f7ba69
--- /dev/null
+++ b/ui/enhancement_shaman/gear_sets/phase_5.gear.json
@@ -0,0 +1,21 @@
+{
+    "items": [
+      {"id":18817,"enchant":2543},
+      {"id":21664},
+      {"id":21665},
+      {"id":19436,"enchant":849},
+      {"id":21680,"enchant":1891},
+      {"id":21602,"enchant":1885},
+      {"id":19157,"enchant":931},
+      {"id":21607},
+      {"id":21651,"enchant":2543},
+      {"id":21493,"enchant":911},
+      {"id":18821},
+      {"id":19384},
+      {"id":19406},
+      {"id":11815},
+      {"id":21134,"enchant":1900},
+      {},
+      {"id":22395}
+    ]
+}
diff --git a/ui/enhancement_shaman/presets.ts b/ui/enhancement_shaman/presets.ts
index 8348d4e74..b1e4e8232 100644
--- a/ui/enhancement_shaman/presets.ts
+++ b/ui/enhancement_shaman/presets.ts
@@ -13,6 +13,7 @@ import {
 	ManaRegenElixir,
 	Potions,
 	Profession,
+	Race,
 	RaidBuffs,
 	SaygesFortune,
 	SpellPowerBuff,
@@ -25,6 +26,9 @@ import { EnhancementShaman_Options as EnhancementShamanOptions, ShamanSyncType }
 import { SavedTalents } from '../core/proto/ui.js';
 import DefaultAPLJSON from './apls/default.apl.json';
 import Phase1GearJSON from './gear_sets/phase_1.gear.json';
+import Phase2GearJSON from './gear_sets/phase_2.gear.json';
+import Phase3GearJSON from './gear_sets/phase_3.gear.json';
+import Phase5GearJSON from './gear_sets/phase_5.gear.json';
 
 // Preset options for this spec.
 // Eventually we will import these values for the raid sim too, so its good to
@@ -34,13 +38,16 @@ import Phase1GearJSON from './gear_sets/phase_1.gear.json';
 ///////////////////////////////////////////////////////////////////////////
 
 export const GearPhase1 = PresetUtils.makePresetGear('Phase 1', Phase1GearJSON);
+export const GearPhase2 = PresetUtils.makePresetGear('Phase 2', Phase2GearJSON);
+export const GearPhase3 = PresetUtils.makePresetGear('Phase 3', Phase3GearJSON);
+export const GearPhase5 = PresetUtils.makePresetGear('Phase 5', Phase5GearJSON);
 
 export const GearPresets = {
 	[Phase.Phase1]: [GearPhase1],
-	[Phase.Phase2]: [],
-	[Phase.Phase3]: [],
+	[Phase.Phase2]: [GearPhase2],
+	[Phase.Phase3]: [GearPhase3],
 	[Phase.Phase4]: [],
-	[Phase.Phase5]: [],
+	[Phase.Phase5]: [GearPhase5],
 	[Phase.Phase6]: [],
 };
 
@@ -137,4 +144,5 @@ export const DefaultDebuffs = Debuffs.create({
 export const OtherDefaults = {
 	profession1: Profession.Alchemy,
 	profession2: Profession.Enchanting,
+	race: Race.RaceOrc,
 };
diff --git a/ui/enhancement_shaman/sim.ts b/ui/enhancement_shaman/sim.ts
index 7ec957b93..32de41ca4 100644
--- a/ui/enhancement_shaman/sim.ts
+++ b/ui/enhancement_shaman/sim.ts
@@ -70,7 +70,7 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecEnhancementShaman, {
 	displayPseudoStats: [],
 	
 	defaults: {
-		race: Race.RaceTroll,
+		race: Presets.OtherDefaults.race,
 		// Default equipped gear.
 		gear: Presets.DefaultGear.gear,
 		// Default EP weights for sorting gear in the gear picker.