diff --git a/sim/hunter/survival/TestSV.results b/sim/hunter/survival/TestSV.results
index 0ea928f4ed..4a1f65ee33 100644
--- a/sim/hunter/survival/TestSV.results
+++ b/sim/hunter/survival/TestSV.results
@@ -38,1509 +38,1509 @@ character_stats_results: {
 dps_results: {
  key: "TestSV-AllItems-AgileShadowspiritDiamond"
  value: {
-  dps: 26189.08622
-  tps: 23660.08282
+  dps: 25066.47529
+  tps: 22539.16131
  }
 }
 dps_results: {
  key: "TestSV-AllItems-AgonyandTorment"
  value: {
-  dps: 25219.70356
-  tps: 22779.40667
+  dps: 24196.37665
+  tps: 21773.99035
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Ahn'KaharBloodHunter'sBattlegear"
  value: {
-  dps: 22045.86185
-  tps: 19938.31005
+  dps: 21066.08159
+  tps: 18951.25435
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Althor'sAbacus-50366"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-AncientPetrifiedSeed-69001"
  value: {
-  dps: 25864.532
-  tps: 23400.95386
+  dps: 24740.83732
+  tps: 22287.73372
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Anhuur'sHymnal-55889"
  value: {
-  dps: 24809.31359
-  tps: 22419.54297
+  dps: 23701.50307
+  tps: 21316.91649
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Anhuur'sHymnal-56407"
  value: {
-  dps: 24809.31359
-  tps: 22419.54297
+  dps: 23701.50307
+  tps: 21316.91649
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ApparatusofKhaz'goroth-68972"
  value: {
-  dps: 24475.60132
-  tps: 22111.63781
+  dps: 23516.63356
+  tps: 21157.58784
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ApparatusofKhaz'goroth-69113"
  value: {
-  dps: 24478.64407
-  tps: 22114.68056
+  dps: 23523.42749
+  tps: 21163.51052
  }
 }
 dps_results: {
  key: "TestSV-AllItems-AustereShadowspiritDiamond"
  value: {
-  dps: 25618.44923
-  tps: 23108.9212
+  dps: 24503.30521
+  tps: 21996.51441
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BaubleofTrueBlood-50726"
  value: {
-  dps: 24461.92363
-  tps: 22098.11779
-  hps: 95.46299
+  dps: 23445.17765
+  tps: 21090.78369
+  hps: 96.23119
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BedrockTalisman-58182"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BellofEnragingResonance-59326"
  value: {
-  dps: 24789.20026
-  tps: 22390.76062
+  dps: 23729.50284
+  tps: 21350.02418
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BellofEnragingResonance-65053"
  value: {
-  dps: 24847.27577
-  tps: 22445.81732
+  dps: 23769.15723
+  tps: 21387.66701
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BindingPromise-67037"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BlackBruise-50692"
  value: {
-  dps: 24305.8237
-  tps: 21962.33894
+  dps: 23259.43683
+  tps: 20918.41445
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Blood-SoakedAleMug-63843"
  value: {
-  dps: 25280.63561
-  tps: 22863.70938
+  dps: 24180.06046
+  tps: 21772.81957
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BloodofIsiset-55995"
  value: {
-  dps: 24684.38707
-  tps: 22320.50353
+  dps: 23641.27771
+  tps: 21286.90433
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BloodofIsiset-56414"
  value: {
-  dps: 24713.53325
-  tps: 22349.60152
+  dps: 23666.96539
+  tps: 21312.54383
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BloodthirstyGladiator'sBadgeofConquest-64687"
  value: {
-  dps: 25564.90761
-  tps: 23103.47667
+  dps: 24441.87033
+  tps: 21995.26152
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BloodthirstyGladiator'sBadgeofDominance-64688"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BloodthirstyGladiator'sBadgeofVictory-64689"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BloodthirstyGladiator'sEmblemofCruelty-64740"
  value: {
-  dps: 24770.11894
-  tps: 22372.6993
+  dps: 23708.47136
+  tps: 21329.99774
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BloodthirstyGladiator'sEmblemofMeditation-64741"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BloodthirstyGladiator'sEmblemofTenacity-64742"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BloodthirstyGladiator'sInsigniaofConquest-64761"
  value: {
-  dps: 25595.83702
-  tps: 23110.62896
+  dps: 24506.65338
+  tps: 22036.65809
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BloodthirstyGladiator'sInsigniaofDominance-64762"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BloodthirstyGladiator'sInsigniaofVictory-64763"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BottledLightning-66879"
  value: {
-  dps: 24555.48429
-  tps: 22185.15183
+  dps: 23529.66578
+  tps: 21169.75967
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BracingShadowspiritDiamond"
  value: {
-  dps: 25618.44923
-  tps: 22646.74277
+  dps: 24503.30521
+  tps: 21556.58412
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Brawler'sTrophy-232015"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Bryntroll,theBoneArbiter-50709"
  value: {
-  dps: 26190.26052
-  tps: 23661.3585
+  dps: 25099.85485
+  tps: 22572.33539
  }
 }
 dps_results: {
  key: "TestSV-AllItems-BurningShadowspiritDiamond"
  value: {
-  dps: 26015.29042
-  tps: 23504.67646
+  dps: 24884.01385
+  tps: 22376.13712
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ChaoticShadowspiritDiamond"
  value: {
-  dps: 26070.84268
-  tps: 23554.7299
+  dps: 24941.00749
+  tps: 22426.33042
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Coren'sChilledChromiumCoaster-232012"
  value: {
-  dps: 25233.57363
-  tps: 22787.58438
+  dps: 24163.77342
+  tps: 21735.73144
  }
 }
 dps_results: {
  key: "TestSV-AllItems-CoreofRipeness-58184"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-CorpseTongueCoin-50349"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-CrushingWeight-59506"
  value: {
-  dps: 24497.31912
-  tps: 22120.20603
+  dps: 23470.19197
+  tps: 21099.23808
  }
 }
 dps_results: {
  key: "TestSV-AllItems-CrushingWeight-65118"
  value: {
-  dps: 24477.58205
-  tps: 22113.09356
+  dps: 23433.5843
+  tps: 21047.22959
  }
 }
 dps_results: {
  key: "TestSV-AllItems-DarkmoonCard:Earthquake-62048"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-DarkmoonCard:Hurricane-62049"
  value: {
-  dps: 24898.34682
-  tps: 22531.95931
+  dps: 23817.70901
+  tps: 21467.86848
  }
 }
 dps_results: {
  key: "TestSV-AllItems-DarkmoonCard:Hurricane-62051"
  value: {
-  dps: 25972.85308
-  tps: 23494.77701
+  dps: 24837.71388
+  tps: 22378.38766
  }
 }
 dps_results: {
  key: "TestSV-AllItems-DarkmoonCard:Tsunami-62050"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-DarkmoonCard:Volcano-62047"
  value: {
-  dps: 24751.46096
-  tps: 22387.28911
+  dps: 23700.72666
+  tps: 21345.71394
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Deathbringer'sWill-50363"
  value: {
-  dps: 25110.89845
-  tps: 22676.5531
+  dps: 24056.7005
+  tps: 21633.01848
  }
 }
 dps_results: {
  key: "TestSV-AllItems-DestructiveShadowspiritDiamond"
  value: {
-  dps: 25671.0258
-  tps: 23155.99895
+  dps: 24557.42945
+  tps: 22043.83831
  }
 }
 dps_results: {
  key: "TestSV-AllItems-DislodgedForeignObject-50348"
  value: {
-  dps: 24706.88044
-  tps: 22348.20788
+  dps: 23580.62499
+  tps: 21208.27854
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Dwyer'sCaber-70141"
  value: {
-  dps: 24883.27815
-  tps: 22478.10857
+  dps: 23834.47307
+  tps: 21443.15152
  }
 }
 dps_results: {
  key: "TestSV-AllItems-EffulgentShadowspiritDiamond"
  value: {
-  dps: 25618.44923
-  tps: 23108.9212
+  dps: 24503.30521
+  tps: 21996.51441
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ElectrosparkHeartstarter-67118"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-EmberShadowspiritDiamond"
  value: {
-  dps: 25618.44923
-  tps: 23108.9212
+  dps: 24503.30521
+  tps: 21996.51441
  }
 }
 dps_results: {
  key: "TestSV-AllItems-EnigmaticShadowspiritDiamond"
  value: {
-  dps: 25671.0258
-  tps: 23155.99895
+  dps: 24557.42945
+  tps: 22043.83831
  }
 }
 dps_results: {
  key: "TestSV-AllItems-EssenceoftheCyclone-59473"
  value: {
-  dps: 25931.62577
-  tps: 23422.18797
+  dps: 24852.32089
+  tps: 22355.254
  }
 }
 dps_results: {
  key: "TestSV-AllItems-EssenceoftheCyclone-65140"
  value: {
-  dps: 26122.51756
-  tps: 23594.94552
+  dps: 24994.51799
+  tps: 22479.63834
  }
 }
 dps_results: {
  key: "TestSV-AllItems-EssenceoftheEternalFlame-69002"
  value: {
-  dps: 24800.08856
-  tps: 22436.01372
+  dps: 23743.25001
+  tps: 21388.68535
  }
 }
 dps_results: {
  key: "TestSV-AllItems-EternalShadowspiritDiamond"
  value: {
-  dps: 25618.44923
-  tps: 23108.9212
+  dps: 24503.30521
+  tps: 21996.51441
  }
 }
 dps_results: {
  key: "TestSV-AllItems-FallofMortality-59500"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-FallofMortality-65124"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-FieryQuintessence-69000"
  value: {
-  dps: 24441.09479
-  tps: 22097.72941
+  dps: 23404.92035
+  tps: 21075.74825
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Figurine-DemonPanther-52199"
  value: {
-  dps: 25813.197
-  tps: 23337.8196
+  dps: 24604.33862
+  tps: 22141.28461
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Figurine-DreamOwl-52354"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Figurine-EarthenGuardian-52352"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Figurine-JeweledSerpent-52353"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Figurine-KingofBoars-52351"
  value: {
-  dps: 24713.53325
-  tps: 22349.60152
+  dps: 23666.96539
+  tps: 21312.54383
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Flamewaker'sBattlegear"
  value: {
-  dps: 26633.74628
-  tps: 24069.21807
+  dps: 26671.69825
+  tps: 24122.77274
  }
 }
 dps_results: {
  key: "TestSV-AllItems-FleetShadowspiritDiamond"
  value: {
-  dps: 25668.33458
-  tps: 23158.71811
+  dps: 24546.99694
+  tps: 22040.1177
  }
 }
 dps_results: {
  key: "TestSV-AllItems-FluidDeath-58181"
  value: {
-  dps: 26051.56773
-  tps: 23529.45694
+  dps: 24892.87056
+  tps: 22378.14142
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ForlornShadowspiritDiamond"
  value: {
-  dps: 25618.44923
-  tps: 23108.9212
+  dps: 24503.30521
+  tps: 21996.51441
  }
 }
 dps_results: {
  key: "TestSV-AllItems-FuryofAngerforge-59461"
  value: {
-  dps: 24789.20026
-  tps: 22390.76062
+  dps: 23729.50284
+  tps: 21350.02418
  }
 }
 dps_results: {
  key: "TestSV-AllItems-GaleofShadows-56138"
  value: {
-  dps: 24608.63677
-  tps: 22242.74417
+  dps: 23641.8813
+  tps: 21274.86677
  }
 }
 dps_results: {
  key: "TestSV-AllItems-GaleofShadows-56462"
  value: {
-  dps: 24682.53834
-  tps: 22291.88466
+  dps: 23574.17141
+  tps: 21184.55532
  }
 }
 dps_results: {
  key: "TestSV-AllItems-GearDetector-61462"
  value: {
-  dps: 25231.74864
-  tps: 22785.41691
+  dps: 24033.58821
+  tps: 21584.22727
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Gladiator'sPursuit"
  value: {
-  dps: 23074.06268
-  tps: 20826.09004
+  dps: 21958.50817
+  tps: 19719.4639
  }
 }
 dps_results: {
  key: "TestSV-AllItems-GlowingTwilightScale-54589"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-GraceoftheHerald-55266"
  value: {
-  dps: 25230.96017
-  tps: 22784.47142
+  dps: 24171.36078
+  tps: 21736.34459
  }
 }
 dps_results: {
  key: "TestSV-AllItems-GraceoftheHerald-56295"
  value: {
-  dps: 25645.24571
-  tps: 23156.74507
+  dps: 24549.05469
+  tps: 22080.54929
  }
 }
 dps_results: {
  key: "TestSV-AllItems-HarmlightToken-63839"
  value: {
-  dps: 24469.22132
-  tps: 22105.66131
+  dps: 23452.53083
+  tps: 21098.53264
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Harrison'sInsigniaofPanache-65803"
  value: {
-  dps: 24475.08593
-  tps: 22111.57036
+  dps: 23526.31072
+  tps: 21172.30531
  }
 }
 dps_results: {
  key: "TestSV-AllItems-HeartofIgnacious-59514"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-HeartofIgnacious-65110"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-HeartofRage-59224"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-HeartofRage-65072"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-HeartofSolace-55868"
  value: {
-  dps: 24608.63677
-  tps: 22242.74417
+  dps: 23641.8813
+  tps: 21274.86677
  }
 }
 dps_results: {
  key: "TestSV-AllItems-HeartofSolace-56393"
  value: {
-  dps: 24682.53834
-  tps: 22291.88466
+  dps: 23574.17141
+  tps: 21184.55532
  }
 }
 dps_results: {
  key: "TestSV-AllItems-HeartofThunder-55845"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-HeartofThunder-56370"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-HeartoftheVile-66969"
  value: {
-  dps: 25370.53014
-  tps: 22907.95247
+  dps: 24293.00754
+  tps: 21845.86721
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Heartpierce-50641"
  value: {
-  dps: 26363.69704
-  tps: 23817.41525
+  dps: 25217.65082
+  tps: 22672.7543
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ImpassiveShadowspiritDiamond"
  value: {
-  dps: 25671.0258
-  tps: 23155.99895
+  dps: 24557.42945
+  tps: 22043.83831
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ImpatienceofYouth-62464"
  value: {
-  dps: 24745.32908
-  tps: 22381.34478
+  dps: 23694.98831
+  tps: 21340.51418
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ImpatienceofYouth-62469"
  value: {
-  dps: 24745.32908
-  tps: 22381.34478
+  dps: 23694.98831
+  tps: 21340.51418
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ImpetuousQuery-55881"
  value: {
-  dps: 24684.38707
-  tps: 22320.50353
+  dps: 23641.27771
+  tps: 21286.90433
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ImpetuousQuery-56406"
  value: {
-  dps: 24713.53325
-  tps: 22349.60152
+  dps: 23666.96539
+  tps: 21312.54383
  }
 }
 dps_results: {
  key: "TestSV-AllItems-InsigniaofDiplomacy-61433"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-InsigniaoftheEarthenLord-61429"
  value: {
-  dps: 24643.34125
-  tps: 22284.98109
+  dps: 23598.44224
+  tps: 21250.10687
  }
 }
 dps_results: {
  key: "TestSV-AllItems-JarofAncientRemedies-59354"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-JarofAncientRemedies-65029"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-JawsofDefeat-68926"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-JawsofDefeat-69111"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-JujuofNimbleness-63840"
  value: {
-  dps: 25280.63561
-  tps: 22863.70938
+  dps: 24180.06046
+  tps: 21772.81957
  }
 }
 dps_results: {
  key: "TestSV-AllItems-KeytotheEndlessChamber-55795"
  value: {
-  dps: 25767.02273
-  tps: 23277.71613
+  dps: 24608.52403
+  tps: 22125.02167
  }
 }
 dps_results: {
  key: "TestSV-AllItems-KvaldirBattleStandard-59685"
  value: {
-  dps: 24700.69094
-  tps: 22342.0734
+  dps: 23545.74071
+  tps: 21163.4394
  }
 }
 dps_results: {
  key: "TestSV-AllItems-KvaldirBattleStandard-59689"
  value: {
-  dps: 24700.69094
-  tps: 22342.0734
+  dps: 23545.74071
+  tps: 21163.4394
  }
 }
 dps_results: {
  key: "TestSV-AllItems-LadyLa-La'sSingingShell-67152"
  value: {
-  dps: 24523.78269
-  tps: 22152.14736
+  dps: 23525.62218
+  tps: 21158.84258
  }
 }
 dps_results: {
  key: "TestSV-AllItems-LastWord-50708"
  value: {
-  dps: 26189.08622
-  tps: 23660.08282
+  dps: 25066.47529
+  tps: 22539.16131
  }
 }
 dps_results: {
  key: "TestSV-AllItems-LeadenDespair-55816"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-LeadenDespair-56347"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-LeftEyeofRajh-56102"
  value: {
-  dps: 25463.03727
-  tps: 22998.63503
+  dps: 24376.85031
+  tps: 21925.05822
  }
 }
 dps_results: {
  key: "TestSV-AllItems-LeftEyeofRajh-56427"
  value: {
-  dps: 25680.33247
-  tps: 23202.98507
+  dps: 24560.62618
+  tps: 22091.72063
  }
 }
 dps_results: {
  key: "TestSV-AllItems-LicensetoSlay-58180"
  value: {
-  dps: 24809.31359
-  tps: 22419.54297
+  dps: 23701.50307
+  tps: 21316.91649
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Lightning-ChargedBattlegear"
  value: {
-  dps: 24914.30468
-  tps: 22547.83059
+  dps: 23965.11551
+  tps: 21586.8931
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MagnetiteMirror-55814"
  value: {
-  dps: 24472.1151
-  tps: 22114.03822
+  dps: 23447.38956
+  tps: 21099.33747
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MagnetiteMirror-56345"
  value: {
-  dps: 24472.1151
-  tps: 22114.03822
+  dps: 23447.38956
+  tps: 21099.33747
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MandalaofStirringPatterns-62467"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MandalaofStirringPatterns-62472"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MarkofKhardros-56132"
  value: {
-  dps: 24641.68346
-  tps: 22283.60658
+  dps: 23593.69314
+  tps: 21245.64106
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MarkofKhardros-56458"
  value: {
-  dps: 24663.88884
-  tps: 22305.81196
+  dps: 23612.85195
+  tps: 21264.79986
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MatrixRestabilizer-68994"
  value: {
-  dps: 26495.3349
-  tps: 23928.54269
+  dps: 25409.79577
+  tps: 22861.42815
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MatrixRestabilizer-69150"
  value: {
-  dps: 26716.03523
-  tps: 24129.84673
+  dps: 25624.7739
+  tps: 23053.32205
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MightoftheOcean-55251"
  value: {
-  dps: 24841.6226
-  tps: 22454.19207
+  dps: 23702.59261
+  tps: 21319.67833
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MightoftheOcean-56285"
  value: {
-  dps: 24841.6226
-  tps: 22454.19207
+  dps: 23702.59261
+  tps: 21319.67833
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MirrorofBrokenImages-62466"
  value: {
-  dps: 24745.32908
-  tps: 22381.34478
+  dps: 23694.98831
+  tps: 21340.51418
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MirrorofBrokenImages-62471"
  value: {
-  dps: 24745.32908
-  tps: 22381.34478
+  dps: 23694.98831
+  tps: 21340.51418
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MithrilStopwatch-232013"
  value: {
-  dps: 24771.22638
-  tps: 22373.23629
+  dps: 23710.47908
+  tps: 21332.00545
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MoonwellChalice-70142"
  value: {
-  dps: 24738.9743
-  tps: 22375.45873
+  dps: 23687.15291
+  tps: 21333.14751
  }
 }
 dps_results: {
  key: "TestSV-AllItems-MoonwellPhial-70143"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-NecromanticFocus-68982"
  value: {
-  dps: 24491.59503
-  tps: 22128.07946
+  dps: 23472.86482
+  tps: 21118.85942
  }
 }
 dps_results: {
  key: "TestSV-AllItems-NecromanticFocus-69139"
  value: {
-  dps: 24495.41281
-  tps: 22131.89724
+  dps: 23476.4222
+  tps: 21122.4168
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Oremantle'sFavor-61448"
  value: {
-  dps: 24649.82085
-  tps: 22270.72684
+  dps: 23612.95159
+  tps: 21245.00382
  }
 }
 dps_results: {
  key: "TestSV-AllItems-PetrifiedPickledEgg-232014"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-PetrifiedTwilightScale-54591"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-PhylacteryoftheNamelessLich-50365"
  value: {
-  dps: 24655.7015
-  tps: 22267.99937
+  dps: 23584.35603
+  tps: 21214.03922
  }
 }
 dps_results: {
  key: "TestSV-AllItems-PorcelainCrab-55237"
  value: {
-  dps: 24466.27877
-  tps: 22102.7632
+  dps: 23520.67329
+  tps: 21166.66789
  }
 }
 dps_results: {
  key: "TestSV-AllItems-PorcelainCrab-56280"
  value: {
-  dps: 24468.62287
-  tps: 22105.1073
+  dps: 23568.29121
+  tps: 21214.28581
  }
 }
 dps_results: {
  key: "TestSV-AllItems-PowerfulShadowspiritDiamond"
  value: {
-  dps: 25618.44923
-  tps: 23108.9212
+  dps: 24503.30521
+  tps: 21996.51441
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Prestor'sTalismanofMachination-59441"
  value: {
-  dps: 25920.76065
-  tps: 23392.98347
+  dps: 24705.45165
+  tps: 22200.94251
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Prestor'sTalismanofMachination-65026"
  value: {
-  dps: 26205.98613
-  tps: 23668.71765
+  dps: 24843.43108
+  tps: 22301.96938
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Rainsong-55854"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Rainsong-56377"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ReverberatingShadowspiritDiamond"
  value: {
-  dps: 26015.29042
-  tps: 23504.67646
+  dps: 24884.01385
+  tps: 22376.13712
  }
 }
 dps_results: {
  key: "TestSV-AllItems-RevitalizingShadowspiritDiamond"
  value: {
-  dps: 26015.29042
-  tps: 23504.67646
+  dps: 24884.01385
+  tps: 22376.13712
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Ricket'sMagneticFireball-70144"
  value: {
-  dps: 25983.54034
-  tps: 23470.26526
+  dps: 24851.37962
+  tps: 22360.11516
  }
 }
 dps_results: {
  key: "TestSV-AllItems-RightEyeofRajh-56100"
  value: {
-  dps: 24809.31359
-  tps: 22419.54297
+  dps: 23701.50307
+  tps: 21316.91649
  }
 }
 dps_results: {
  key: "TestSV-AllItems-RightEyeofRajh-56431"
  value: {
-  dps: 24809.31359
-  tps: 22419.54297
+  dps: 23701.50307
+  tps: 21316.91649
  }
 }
 dps_results: {
  key: "TestSV-AllItems-RuneofZeth-68998"
  value: {
-  dps: 24880.66176
-  tps: 22476.01984
+  dps: 23801.02264
+  tps: 21414.3049
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ScalesofLife-68915"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
   hps: 312.86699
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ScalesofLife-69109"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
   hps: 352.91104
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Schnottz'sMedallionofCommand-65805"
  value: {
-  dps: 25262.26776
-  tps: 22812.5729
+  dps: 24244.04517
+  tps: 21810.24524
  }
 }
 dps_results: {
  key: "TestSV-AllItems-SeaStar-55256"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-SeaStar-56290"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Shadowmourne-49623"
  value: {
-  dps: 26553.00217
-  tps: 23989.29552
+  dps: 25339.18213
+  tps: 22767.70351
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ShardofWoe-60233"
  value: {
-  dps: 24695.62961
-  tps: 22302.0634
+  dps: 23638.28535
+  tps: 21259.90287
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Shrine-CleansingPurifier-63838"
  value: {
-  dps: 24478.98018
-  tps: 22122.98795
+  dps: 23470.64718
+  tps: 21134.41678
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Sindragosa'sFlawlessFang-50364"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Skardyn'sGrace-56115"
  value: {
-  dps: 25529.2619
-  tps: 23072.54958
+  dps: 24401.62055
+  tps: 21962.68594
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Skardyn'sGrace-56440"
  value: {
-  dps: 25665.59433
-  tps: 23198.96515
+  dps: 24530.21781
+  tps: 22081.64588
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Sorrowsong-55879"
  value: {
-  dps: 24684.38707
-  tps: 22320.50353
+  dps: 23641.27771
+  tps: 21286.90433
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Sorrowsong-56400"
  value: {
-  dps: 24713.53325
-  tps: 22349.60152
+  dps: 23666.96539
+  tps: 21312.54383
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Soul'sAnguish-66994"
  value: {
-  dps: 24841.6226
-  tps: 22454.19207
+  dps: 23702.59261
+  tps: 21319.67833
  }
 }
 dps_results: {
  key: "TestSV-AllItems-SoulCasket-58183"
  value: {
-  dps: 24745.32908
-  tps: 22381.34478
+  dps: 23694.98831
+  tps: 21340.51418
  }
 }
 dps_results: {
  key: "TestSV-AllItems-SpidersilkSpindle-68981"
  value: {
-  dps: 24800.08856
-  tps: 22436.01372
+  dps: 23743.25001
+  tps: 21388.68535
  }
 }
 dps_results: {
  key: "TestSV-AllItems-SpidersilkSpindle-69138"
  value: {
-  dps: 24844.24943
-  tps: 22480.10158
+  dps: 23782.17074
+  tps: 21427.53306
  }
 }
 dps_results: {
  key: "TestSV-AllItems-StayofExecution-68996"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Stonemother'sKiss-61411"
  value: {
-  dps: 24474.26667
-  tps: 22107.79054
+  dps: 23462.02912
+  tps: 21104.74123
  }
 }
 dps_results: {
  key: "TestSV-AllItems-StumpofTime-62465"
  value: {
-  dps: 24809.31359
-  tps: 22419.54297
+  dps: 23701.50307
+  tps: 21316.91649
  }
 }
 dps_results: {
  key: "TestSV-AllItems-StumpofTime-62470"
  value: {
-  dps: 24809.31359
-  tps: 22419.54297
+  dps: 23701.50307
+  tps: 21316.91649
  }
 }
 dps_results: {
  key: "TestSV-AllItems-SymbioticWorm-59332"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-SymbioticWorm-65048"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-TalismanofSinisterOrder-65804"
  value: {
-  dps: 24526.88743
-  tps: 22163.24006
+  dps: 23505.57286
+  tps: 21151.43566
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Tank-CommanderInsignia-63841"
  value: {
-  dps: 24497.84844
-  tps: 22129.99152
+  dps: 23390.88885
+  tps: 21047.64714
  }
 }
 dps_results: {
  key: "TestSV-AllItems-TearofBlood-55819"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-TearofBlood-56351"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-TendrilsofBurrowingDark-55810"
  value: {
-  dps: 24651.70803
-  tps: 22287.87851
+  dps: 23612.47637
+  tps: 21258.15702
  }
 }
 dps_results: {
  key: "TestSV-AllItems-TendrilsofBurrowingDark-56339"
  value: {
-  dps: 24713.53325
-  tps: 22349.60152
+  dps: 23666.96539
+  tps: 21312.54383
  }
 }
 dps_results: {
  key: "TestSV-AllItems-TheHungerer-68927"
  value: {
-  dps: 26131.35713
-  tps: 23591.27479
+  dps: 24821.76458
+  tps: 22300.76904
  }
 }
 dps_results: {
  key: "TestSV-AllItems-TheHungerer-69112"
  value: {
-  dps: 26309.56632
-  tps: 23747.36162
+  dps: 25097.43435
+  tps: 22564.04445
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Theralion'sMirror-59519"
  value: {
-  dps: 24470.28128
-  tps: 22106.76571
+  dps: 23452.44633
+  tps: 21098.44093
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Theralion'sMirror-65105"
  value: {
-  dps: 24502.37946
-  tps: 22138.28951
+  dps: 23483.11508
+  tps: 21128.53531
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Throngus'sFinger-56121"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Throngus'sFinger-56449"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Tia'sGrace-55874"
  value: {
-  dps: 25695.23105
-  tps: 23226.22996
+  dps: 24557.03601
+  tps: 22105.24621
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Tia'sGrace-56394"
  value: {
-  dps: 25849.53386
-  tps: 23367.35373
+  dps: 24718.48042
+  tps: 22254.12134
  }
 }
 dps_results: {
  key: "TestSV-AllItems-TinyAbominationinaJar-50706"
  value: {
-  dps: 24581.62643
-  tps: 22215.16588
+  dps: 23529.72664
+  tps: 21181.82333
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Tyrande'sFavoriteDoll-64645"
  value: {
-  dps: 23707.95293
-  tps: 21425.48702
+  dps: 22700.89052
+  tps: 20430.11059
  }
 }
 dps_results: {
  key: "TestSV-AllItems-UnheededWarning-59520"
  value: {
-  dps: 25564.8077
-  tps: 23084.32707
+  dps: 24566.04251
+  tps: 22091.97238
  }
 }
 dps_results: {
  key: "TestSV-AllItems-UnquenchableFlame-67101"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-UnsolvableRiddle-62463"
  value: {
-  dps: 25836.50186
-  tps: 23377.13527
+  dps: 24709.26703
+  tps: 22265.39005
  }
 }
 dps_results: {
  key: "TestSV-AllItems-UnsolvableRiddle-62468"
  value: {
-  dps: 25836.50186
-  tps: 23377.13527
+  dps: 24709.26703
+  tps: 22265.39005
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Val'anyr,HammerofAncientKings-46017"
  value: {
-  dps: 24340.88437
-  tps: 21976.15713
+  dps: 23239.86032
+  tps: 20895.87705
  }
 }
 dps_results: {
  key: "TestSV-AllItems-VariablePulseLightningCapacitor-68925"
  value: {
-  dps: 25127.15989
-  tps: 22763.49873
+  dps: 24062.06573
+  tps: 21707.42205
  }
 }
 dps_results: {
  key: "TestSV-AllItems-VariablePulseLightningCapacitor-69110"
  value: {
-  dps: 25189.74485
-  tps: 22826.0256
+  dps: 24126.38533
+  tps: 21772.0296
  }
 }
 dps_results: {
  key: "TestSV-AllItems-VesselofAcceleration-68995"
  value: {
-  dps: 24463.76596
-  tps: 22100.25039
+  dps: 23487.32087
+  tps: 21130.05012
  }
 }
 dps_results: {
  key: "TestSV-AllItems-VesselofAcceleration-69167"
  value: {
-  dps: 24463.76596
-  tps: 22100.25039
+  dps: 23492.22618
+  tps: 21134.25857
  }
 }
 dps_results: {
  key: "TestSV-AllItems-VialofStolenMemories-59515"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-VialofStolenMemories-65109"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ViciousGladiator'sBadgeofConquest-61033"
  value: {
-  dps: 25540.48529
-  tps: 23081.58743
+  dps: 24448.31636
+  tps: 22004.90812
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ViciousGladiator'sBadgeofDominance-61035"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ViciousGladiator'sBadgeofVictory-61034"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ViciousGladiator'sEmblemofAccuracy-61027"
  value: {
-  dps: 24809.31359
-  tps: 22419.54297
+  dps: 23701.50307
+  tps: 21316.91649
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ViciousGladiator'sEmblemofAlacrity-61028"
  value: {
-  dps: 24774.12073
-  tps: 22380.08132
+  dps: 23678.21383
+  tps: 21298.12601
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ViciousGladiator'sEmblemofCruelty-61026"
  value: {
-  dps: 24809.43648
-  tps: 22409.14557
+  dps: 23745.66566
+  tps: 21365.5399
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ViciousGladiator'sEmblemofProficiency-61030"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ViciousGladiator'sEmblemofProwess-61029"
  value: {
-  dps: 24762.11021
-  tps: 22398.09816
+  dps: 23709.77819
+  tps: 21355.27631
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ViciousGladiator'sEmblemofTenacity-61032"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ViciousGladiator'sInsigniaofConquest-61047"
  value: {
-  dps: 25642.00167
-  tps: 23151.26806
+  dps: 24591.38422
+  tps: 22112.43138
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ViciousGladiator'sInsigniaofDominance-61045"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-ViciousGladiator'sInsigniaofVictory-61046"
  value: {
-  dps: 24461.81628
-  tps: 22098.30071
+  dps: 23445.11725
+  tps: 21091.11185
  }
 }
 dps_results: {
  key: "TestSV-AllItems-WitchingHourglass-55787"
  value: {
-  dps: 24487.48255
-  tps: 22128.28616
+  dps: 23434.75327
+  tps: 21085.73836
  }
 }
 dps_results: {
  key: "TestSV-AllItems-WitchingHourglass-56320"
  value: {
-  dps: 24484.38443
-  tps: 22117.87773
+  dps: 23424.34568
+  tps: 21074.29214
  }
 }
 dps_results: {
  key: "TestSV-AllItems-World-QuellerFocus-63842"
  value: {
-  dps: 24655.2409
-  tps: 22291.40554
+  dps: 23615.59003
+  tps: 21261.26484
  }
 }
 dps_results: {
  key: "TestSV-AllItems-WyrmstalkerBattlegear"
  value: {
-  dps: 27508.17929
-  tps: 25037.8138
+  dps: 25433.57205
+  tps: 22947.78928
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Za'brox'sLuckyTooth-63742"
  value: {
-  dps: 24619.47807
-  tps: 22261.4012
+  dps: 23574.53434
+  tps: 21226.48225
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Za'brox'sLuckyTooth-63745"
  value: {
-  dps: 24619.47807
-  tps: 22261.4012
+  dps: 23574.53434
+  tps: 21226.48225
  }
 }
 dps_results: {
  key: "TestSV-AllItems-Zod'sRepeatingLongbow-50638"
  value: {
-  dps: 24887.58298
-  tps: 22415.77692
+  dps: 23768.86115
+  tps: 21298.88045
  }
 }
 dps_results: {
  key: "TestSV-Average-Default"
  value: {
-  dps: 26298.2281
-  tps: 23765.55542
+  dps: 24908.67181
+  tps: 22385.80945
  }
 }
 dps_results: {
@@ -1588,85 +1588,43 @@ dps_results: {
 dps_results: {
  key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-FullBuffs-5.1yards-LongMultiTarget"
  value: {
-  dps: 28705.38406
-  tps: 26298.39938
+  dps: 27396.32819
+  tps: 25011.85584
  }
 }
 dps_results: {
  key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-FullBuffs-5.1yards-LongSingleTarget"
  value: {
-  dps: 25997.64307
-  tps: 23611.33409
+  dps: 24845.88699
+  tps: 22460.38853
  }
 }
 dps_results: {
  key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-FullBuffs-5.1yards-ShortSingleTarget"
  value: {
-  dps: 32500.12093
-  tps: 29345.62018
+  dps: 31772.44254
+  tps: 28671.09314
  }
 }
 dps_results: {
  key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-NoBuffs-5.1yards-LongMultiTarget"
  value: {
-  dps: 20054.64094
-  tps: 18390.96484
+  dps: 19095.07367
+  tps: 17452.7068
  }
 }
 dps_results: {
  key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-NoBuffs-5.1yards-LongSingleTarget"
  value: {
-  dps: 18077.69361
-  tps: 16421.07797
+  dps: 17235.71955
+  tps: 15575.6318
  }
 }
 dps_results: {
  key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv-NoBuffs-5.1yards-ShortSingleTarget"
  value: {
-  dps: 20550.32047
-  tps: 18588.74487
- }
-}
-dps_results: {
- key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv_advanced-FullBuffs-5.1yards-LongMultiTarget"
- value: {
-  dps: 31292.25477
-  tps: 28313.49894
- }
-}
-dps_results: {
- key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv_advanced-FullBuffs-5.1yards-LongSingleTarget"
- value: {
-  dps: 26079.9536
-  tps: 23690.93143
- }
-}
-dps_results: {
- key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv_advanced-FullBuffs-5.1yards-ShortSingleTarget"
- value: {
-  dps: 32624.67808
-  tps: 29452.65684
- }
-}
-dps_results: {
- key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv_advanced-NoBuffs-5.1yards-LongMultiTarget"
- value: {
-  dps: 21777.87511
-  tps: 19710.39586
- }
-}
-dps_results: {
- key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv_advanced-NoBuffs-5.1yards-LongSingleTarget"
- value: {
-  dps: 18211.45932
-  tps: 16559.04946
- }
-}
-dps_results: {
- key: "TestSV-Settings-Dwarf-preraid_sv-Basic-sv_advanced-NoBuffs-5.1yards-ShortSingleTarget"
- value: {
-  dps: 20638.84191
-  tps: 18714.91518
+  dps: 19816.52836
+  tps: 17876.10545
  }
 }
 dps_results: {
@@ -1714,91 +1672,49 @@ dps_results: {
 dps_results: {
  key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-FullBuffs-5.1yards-LongMultiTarget"
  value: {
-  dps: 28975.00296
-  tps: 26422.82276
+  dps: 27697.01554
+  tps: 25170.2238
  }
 }
 dps_results: {
  key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-FullBuffs-5.1yards-LongSingleTarget"
  value: {
-  dps: 26189.08622
-  tps: 23660.08282
+  dps: 25066.47529
+  tps: 22539.16131
  }
 }
 dps_results: {
  key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-FullBuffs-5.1yards-ShortSingleTarget"
  value: {
-  dps: 32916.88261
-  tps: 29559.02613
+  dps: 32269.4441
+  tps: 28974.48
  }
 }
 dps_results: {
  key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-NoBuffs-5.1yards-LongMultiTarget"
  value: {
-  dps: 20282.94985
-  tps: 18517.49277
+  dps: 19317.51805
+  tps: 17575.6461
  }
 }
 dps_results: {
  key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-NoBuffs-5.1yards-LongSingleTarget"
  value: {
-  dps: 18197.78572
-  tps: 16440.41287
+  dps: 17364.81319
+  tps: 15604.8494
  }
 }
 dps_results: {
  key: "TestSV-Settings-Orc-preraid_sv-Basic-sv-NoBuffs-5.1yards-ShortSingleTarget"
  value: {
-  dps: 20859.0939
-  tps: 18767.23626
- }
-}
-dps_results: {
- key: "TestSV-Settings-Orc-preraid_sv-Basic-sv_advanced-FullBuffs-5.1yards-LongMultiTarget"
- value: {
-  dps: 31622.17048
-  tps: 28506.16036
- }
-}
-dps_results: {
- key: "TestSV-Settings-Orc-preraid_sv-Basic-sv_advanced-FullBuffs-5.1yards-LongSingleTarget"
- value: {
-  dps: 26283.78307
-  tps: 23750.58578
- }
-}
-dps_results: {
- key: "TestSV-Settings-Orc-preraid_sv-Basic-sv_advanced-FullBuffs-5.1yards-ShortSingleTarget"
- value: {
-  dps: 33120.46181
-  tps: 29739.90556
- }
-}
-dps_results: {
- key: "TestSV-Settings-Orc-preraid_sv-Basic-sv_advanced-NoBuffs-5.1yards-LongMultiTarget"
- value: {
-  dps: 22041.61174
-  tps: 19878.86868
- }
-}
-dps_results: {
- key: "TestSV-Settings-Orc-preraid_sv-Basic-sv_advanced-NoBuffs-5.1yards-LongSingleTarget"
- value: {
-  dps: 18367.28014
-  tps: 16613.68407
- }
-}
-dps_results: {
- key: "TestSV-Settings-Orc-preraid_sv-Basic-sv_advanced-NoBuffs-5.1yards-ShortSingleTarget"
- value: {
-  dps: 20905.92397
-  tps: 18850.81867
+  dps: 20115.35893
+  tps: 18051.65195
  }
 }
 dps_results: {
  key: "TestSV-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 26034.79574
-  tps: 23532.06855
+  dps: 24881.23442
+  tps: 22390.19995
  }
 }
diff --git a/sim/hunter/survival/survival_test.go b/sim/hunter/survival/survival_test.go
index 1ab6cfdb72..4b37e9bf83 100644
--- a/sim/hunter/survival/survival_test.go
+++ b/sim/hunter/survival/survival_test.go
@@ -25,11 +25,10 @@ func TestSV(t *testing.T) {
 		SpecOptions: core.SpecOptionsCombo{Label: "Basic", SpecOptions: PlayerOptionsBasic},
 		Rotation:    core.GetAplRotation("../../../ui/hunter/survival/apls", "sv"),
 		OtherRotations: []core.RotationCombo{
-			core.GetAplRotation("../../../ui/hunter/survival/apls", "sv_advanced"),
 			core.GetAplRotation("../../../ui/hunter/survival/apls", "aoe"),
 		},
-		StartingDistance:   5.1,
-		ItemFilter:         ItemFilter,
+		StartingDistance: 5.1,
+		ItemFilter:       ItemFilter,
 	}))
 }
 
diff --git a/ui/hunter/beast_mastery/gear_sets/p3_bm.gear.json b/ui/hunter/beast_mastery/gear_sets/p3_bm.gear.json
new file mode 100644
index 0000000000..76c280222c
--- /dev/null
+++ b/ui/hunter/beast_mastery/gear_sets/p3_bm.gear.json
@@ -0,0 +1,21 @@
+{
+	"items":  [
+		{ "id": 71503, "enchant": 4209, "gems": [68778, 52209], "reforging": 151 },
+		{ "id": 71610, "reforging": 166 },
+		{ "id": 71403, "randomSuffix": -294, "enchant": 4204, "gems": [52258], "reforging": 167 },
+		{ "id": 71415, "enchant": 4100, "gems": [52258, 52258], "reforging": 166 },
+		{ "id": 71501, "enchant": 4102, "gems": [52212, 52209], "reforging": 167 },
+		{ "id": 71561, "enchant": 4258, "gems": [52212], "reforging": 152 },
+		{ "id": 71502, "enchant": 4107, "gems": [52212, 52212], "reforging": 151 },
+		{ "id": 71255, "gems": [52212, 52212], "reforging": 166 },
+		{ "id": 71504, "enchant": 4126, "gems": [52212, 52220], "reforging": 137 },
+		{ "id": 71457, "enchant": 4105, "gems": [52212], "reforging": 138 },
+		{ "id": 71216, "gems": [52212], "reforging": 166 },
+		{ "id": 71401, "reforging": 166 },
+		{ "id": 69150 },
+		{ "id": 69112 },
+		{ "id": 71466, "enchant": 4227, "reforging": 165 },
+		{},
+		{ "id": 71611, "enchant": 4267, "reforging": 151 }
+	]
+}
diff --git a/ui/hunter/beast_mastery/presets.ts b/ui/hunter/beast_mastery/presets.ts
index e9f68971e0..3a702414f9 100644
--- a/ui/hunter/beast_mastery/presets.ts
+++ b/ui/hunter/beast_mastery/presets.ts
@@ -14,6 +14,7 @@ import { Stats } from '../../core/proto_utils/stats';
 import AoeApl from './apls/aoe.apl.json';
 import BmApl from './apls/bm.apl.json';
 import P1BMGear from './gear_sets/p1_bm.gear.json';
+import P3BMGear from './gear_sets/p3_bm.gear.json';
 import PreraidBMGear from './gear_sets/preraid_bm.gear.json';
 
 // Preset options for this spec.
@@ -22,6 +23,7 @@ import PreraidBMGear from './gear_sets/preraid_bm.gear.json';
 
 export const BM_PRERAID_PRESET = PresetUtils.makePresetGear('BM PreRaid Preset', PreraidBMGear);
 export const BM_P1_PRESET = PresetUtils.makePresetGear('BM P1 Preset', P1BMGear);
+export const BM_P3_PRESET = PresetUtils.makePresetGear('BM T12 Preset', P3BMGear);
 
 export const DefaultSimpleRotation = BeastMasteryRotation.create({
 	type: RotationType.SingleTarget,
@@ -40,7 +42,6 @@ export const P1_EP_PRESET = PresetUtils.makePresetEpWeights(
 	'BM P1',
 	Stats.fromMap(
 		{
-			[Stat.StatStamina]: 0.5,
 			[Stat.StatAgility]: 2.65,
 			[Stat.StatRangedAttackPower]: 1.0,
 			[Stat.StatHitRating]: 2.12,
@@ -53,6 +54,22 @@ export const P1_EP_PRESET = PresetUtils.makePresetEpWeights(
 		},
 	),
 );
+export const P3_EP_PRESET = PresetUtils.makePresetEpWeights(
+	'BM T12',
+	Stats.fromMap(
+		{
+			[Stat.StatAgility]: 3.03,
+			[Stat.StatRangedAttackPower]: 1.0,
+			[Stat.StatHitRating]: 2.52,
+			[Stat.StatCritRating]: 1.32,
+			[Stat.StatHasteRating]: 1.14,
+			[Stat.StatMasteryRating]: 0.64,
+		},
+		{
+			[PseudoStat.PseudoStatRangedDps]: 6.32,
+		},
+	),
+);
 
 // Default talents. Uses the wowhead calculator format, make the talents on
 // https://wowhead.com/cata/talent-calc and copy the numbers in the url.
diff --git a/ui/hunter/beast_mastery/sim.ts b/ui/hunter/beast_mastery/sim.ts
index 7ecbd83d12..87e26aaad4 100644
--- a/ui/hunter/beast_mastery/sim.ts
+++ b/ui/hunter/beast_mastery/sim.ts
@@ -53,27 +53,17 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBeastMasteryHunter, {
 	epReferenceStat: Stat.StatRangedAttackPower,
 	// Which stats to display in the Character Stats section, at the bottom of the left-hand sidebar.
 	displayStats: UnitStat.createDisplayStatArray(
-		[
-			Stat.StatHealth,
-			Stat.StatStamina,
-			Stat.StatAgility,
-			Stat.StatRangedAttackPower,
-			Stat.StatMasteryRating,
-		],
-		[
-			PseudoStat.PseudoStatPhysicalHitPercent,
-			PseudoStat.PseudoStatPhysicalCritPercent,
-			PseudoStat.PseudoStatRangedHastePercent,
-		],
+		[Stat.StatHealth, Stat.StatStamina, Stat.StatAgility, Stat.StatRangedAttackPower, Stat.StatMasteryRating],
+		[PseudoStat.PseudoStatPhysicalHitPercent, PseudoStat.PseudoStatPhysicalCritPercent, PseudoStat.PseudoStatRangedHastePercent],
 	),
 	modifyDisplayStats: (player: Player<Spec.SpecBeastMasteryHunter>) => {
 		return sharedHunterDisplayStatsModifiers(player);
 	},
 	defaults: {
 		// Default equipped gear.
-		gear: Presets.BM_P1_PRESET.gear,
+		gear: Presets.BM_P3_PRESET.gear,
 		// Default EP weights for sorting gear in the gear picker.
-		epWeights: Presets.P1_EP_PRESET.epWeights,
+		epWeights: Presets.P3_EP_PRESET.epWeights,
 		// Default stat caps for the Reforge Optimizer
 		statCaps: (() => {
 			const hitCap = new Stats().withPseudoStat(PseudoStat.PseudoStatPhysicalHitPercent, 8);
@@ -142,13 +132,13 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecBeastMasteryHunter, {
 	},
 
 	presets: {
-		epWeights: [Presets.P1_EP_PRESET],
+		epWeights: [Presets.P1_EP_PRESET, Presets.P3_EP_PRESET],
 		// Preset talents that the user can quickly select.
 		talents: [Presets.BeastMasteryTalents],
 		// Preset rotations that the user can quickly select.
-		rotations: [Presets.ROTATION_PRESET_SIMPLE_DEFAULT, Presets.ROTATION_PRESET_BM, Presets.ROTATION_PRESET_AOE],
+		rotations: [Presets.ROTATION_PRESET_BM, Presets.ROTATION_PRESET_AOE],
 		// Preset gear configurations that the user can quickly select.
-		gear: [Presets.BM_PRERAID_PRESET, Presets.BM_P1_PRESET],
+		gear: [Presets.BM_P3_PRESET, Presets.BM_PRERAID_PRESET, Presets.BM_P1_PRESET],
 	},
 
 	autoRotation: (player: Player<Spec.SpecBeastMasteryHunter>): APLRotation => {
@@ -249,7 +239,17 @@ export class BeastMasteryHunterSimUI extends IndividualSimUI<Spec.SpecBeastMaste
 		super(parentElem, player, SPEC_CONFIG);
 
 		player.sim.waitForInit().then(() => {
-			new ReforgeOptimizer(this);
+			new ReforgeOptimizer(this, {
+				getEPDefaults: (player: Player<Spec.SpecFuryWarrior>) => {
+					if (player.getGear().getItemSetCount('Lightning-Charged Battlegear') >= 4) {
+						return Presets.P1_EP_PRESET.epWeights;
+					}
+					if (player.getGear().getItemSetCount("Flamewaker's Battlegear") >= 4) {
+						return Presets.P3_EP_PRESET.epWeights;
+					}
+					return Presets.P1_EP_PRESET.epWeights;
+				},
+			});
 		});
 	}
 }
diff --git a/ui/hunter/marksmanship/gear_sets/p3_mm.gear.json b/ui/hunter/marksmanship/gear_sets/p3_mm.gear.json
new file mode 100644
index 0000000000..e85b4ef52c
--- /dev/null
+++ b/ui/hunter/marksmanship/gear_sets/p3_mm.gear.json
@@ -0,0 +1,21 @@
+{
+	"items":  [
+		{ "id": 71503, "enchant": 4209, "gems": [68778, 52209], "reforging": 154 },
+		{ "id": 71610, "reforging": 152 },
+		{ "id": 71403, "randomSuffix": -294, "enchant": 4204, "gems": [52258] },
+		{ "id": 71415, "enchant": 4100, "gems": [52258, 52258], "reforging": 137 },
+		{ "id": 71501, "enchant": 4102, "gems": [52212, 52209] },
+		{ "id": 71561, "enchant": 4258, "gems": [52212], "reforging": 154 },
+		{ "id": 71502, "enchant": 4107, "gems": [52212, 52212], "reforging": 154 },
+		{ "id": 71255, "gems": [52212, 52212], "reforging": 151 },
+		{ "id": 71504, "enchant": 4126, "gems": [52212, 52220], "reforging": 154 },
+		{ "id": 71457, "enchant": 4105, "gems": [52212], "reforging": 147 },
+		{ "id": 71216, "gems": [52212], "reforging": 152 },
+		{ "id": 71401, "reforging": 152 },
+		{ "id": 69150 },
+		{ "id": 69112 },
+		{ "id": 71466, "enchant": 4227, "reforging": 144 },
+		{},
+		{ "id": 71611, "enchant": 4267, "reforging": 154 }
+	]
+}
diff --git a/ui/hunter/marksmanship/presets.ts b/ui/hunter/marksmanship/presets.ts
index 0c519119c4..16d47dcf99 100644
--- a/ui/hunter/marksmanship/presets.ts
+++ b/ui/hunter/marksmanship/presets.ts
@@ -16,6 +16,7 @@ import AoeApl from './apls/aoe.apl.json';
 import MmApl from './apls/mm.apl.json';
 import MmAdvApl from './apls/mm_advanced.apl.json';
 import P1MMGear from './gear_sets/p1_mm.gear.json';
+import T12MMGear from './gear_sets/p3_mm.gear.json';
 import PreraidMMGear from './gear_sets/preraid_mm.gear.json';
 
 // Preset options for this spec.
@@ -24,6 +25,7 @@ import PreraidMMGear from './gear_sets/preraid_mm.gear.json';
 
 export const MM_PRERAID_PRESET = PresetUtils.makePresetGear('MM PreRaid Preset', PreraidMMGear);
 export const MM_P1_PRESET = PresetUtils.makePresetGear('MM P1 Preset', P1MMGear);
+export const MM_T12_PRESET = PresetUtils.makePresetGear('MM T12 Preset', T12MMGear);
 
 export const DefaultSimpleRotation = HunterRotation.create({
 	type: RotationType.SingleTarget,
@@ -43,7 +45,6 @@ export const P1_EP_PRESET = PresetUtils.makePresetEpWeights(
 	'MM P1',
 	Stats.fromMap(
 		{
-			[Stat.StatStamina]: 0.5,
 			[Stat.StatAgility]: 3.05,
 			[Stat.StatRangedAttackPower]: 1.0,
 			[Stat.StatHitRating]: 2.25,
@@ -56,6 +57,22 @@ export const P1_EP_PRESET = PresetUtils.makePresetEpWeights(
 		},
 	),
 );
+export const P3_EP_PRESET = PresetUtils.makePresetEpWeights(
+	'MM P3 (T12 4-set)',
+	Stats.fromMap(
+		{
+			[Stat.StatAgility]: 3.05,
+			[Stat.StatRangedAttackPower]: 1.0,
+			[Stat.StatHitRating]: 2.79,
+			[Stat.StatCritRating]: 1.39,
+			[Stat.StatHasteRating]: 0.9,
+			[Stat.StatMasteryRating]: 1.47,
+		},
+		{
+			[PseudoStat.PseudoStatRangedDps]: 7.33,
+		},
+	),
+);
 
 // Default talents. Uses the wowhead calculator format, make the talents on
 // https://wowhead.com/wotlk/talent-calc and copy the numbers in the url.
diff --git a/ui/hunter/marksmanship/sim.ts b/ui/hunter/marksmanship/sim.ts
index edf17cbd1a..abc43733ce 100644
--- a/ui/hunter/marksmanship/sim.ts
+++ b/ui/hunter/marksmanship/sim.ts
@@ -27,6 +27,7 @@ import * as HunterInputs from '../inputs';
 import { sharedHunterDisplayStatsModifiers } from '../shared';
 import * as MMInputs from './inputs';
 import * as Presets from './presets';
+import { MM_T12_PRESET, P3_EP_PRESET } from './presets';
 const SPEC_CONFIG = registerSpecConfig(Spec.SpecMarksmanshipHunter, {
 	cssClass: 'marksmanship-hunter-sim-ui',
 	cssScheme: 'hunter',
@@ -51,18 +52,8 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecMarksmanshipHunter, {
 	epReferenceStat: Stat.StatRangedAttackPower,
 	// Which stats to display in the Character Stats section, at the bottom of the left-hand sidebar.
 	displayStats: UnitStat.createDisplayStatArray(
-		[
-			Stat.StatHealth,
-			Stat.StatStamina,
-			Stat.StatAgility,
-			Stat.StatRangedAttackPower,
-			Stat.StatMasteryRating,
-		],
-		[
-			PseudoStat.PseudoStatPhysicalHitPercent,
-			PseudoStat.PseudoStatPhysicalCritPercent,
-			PseudoStat.PseudoStatRangedHastePercent,
-		],
+		[Stat.StatHealth, Stat.StatStamina, Stat.StatAgility, Stat.StatRangedAttackPower, Stat.StatMasteryRating],
+		[PseudoStat.PseudoStatPhysicalHitPercent, PseudoStat.PseudoStatPhysicalCritPercent, PseudoStat.PseudoStatRangedHastePercent],
 	),
 	modifyDisplayStats: (player: Player<Spec.SpecMarksmanshipHunter>) => {
 		return sharedHunterDisplayStatsModifiers(player);
@@ -70,9 +61,9 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecMarksmanshipHunter, {
 
 	defaults: {
 		// Default equipped gear.
-		gear: Presets.MM_P1_PRESET.gear,
+		gear: Presets.MM_T12_PRESET.gear,
 		// Default EP weights for sorting gear in the gear picker.
-		epWeights: Presets.P1_EP_PRESET.epWeights,
+		epWeights: Presets.P3_EP_PRESET.epWeights,
 		// Default stat caps for the Reforge Optimizer
 		statCaps: (() => {
 			const hitCap = new Stats().withPseudoStat(PseudoStat.PseudoStatPhysicalHitPercent, 8);
@@ -142,13 +133,13 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecMarksmanshipHunter, {
 	},
 
 	presets: {
-		epWeights: [Presets.P1_EP_PRESET],
+		epWeights: [Presets.P1_EP_PRESET, P3_EP_PRESET],
 		// Preset talents that the user can quickly select.
 		talents: [Presets.MarksmanTalents],
 		// Preset rotations that the user can quickly select.
-		rotations: [Presets.ROTATION_PRESET_SIMPLE_DEFAULT, Presets.ROTATION_PRESET_MM, Presets.ROTATION_PRESET_MM_ADVANCED, Presets.ROTATION_PRESET_AOE],
+		rotations: [Presets.ROTATION_PRESET_MM, Presets.ROTATION_PRESET_MM_ADVANCED, Presets.ROTATION_PRESET_AOE],
 		// Preset gear configurations that the user can quickly select.
-		gear: [Presets.MM_PRERAID_PRESET, Presets.MM_P1_PRESET],
+		gear: [MM_T12_PRESET, Presets.MM_PRERAID_PRESET, Presets.MM_P1_PRESET],
 	},
 
 	autoRotation: (player: Player<Spec.SpecMarksmanshipHunter>): APLRotation => {
@@ -255,7 +246,17 @@ export class MarksmanshipHunterSimUI extends IndividualSimUI<Spec.SpecMarksmansh
 		super(parentElem, player, SPEC_CONFIG);
 
 		player.sim.waitForInit().then(() => {
-			new ReforgeOptimizer(this);
+			new ReforgeOptimizer(this, {
+				getEPDefaults: (player: Player<Spec.SpecFuryWarrior>) => {
+					if (player.getGear().getItemSetCount('Lightning-Charged Battlegear') >= 4) {
+						return Presets.P1_EP_PRESET.epWeights;
+					}
+					if (player.getGear().getItemSetCount("Flamewaker's Battlegear") >= 4) {
+						return Presets.P3_EP_PRESET.epWeights;
+					}
+					return Presets.P1_EP_PRESET.epWeights;
+				},
+			});
 		});
 	}
 }
diff --git a/ui/hunter/survival/apls/sv.apl.json b/ui/hunter/survival/apls/sv.apl.json
index e01501a20f..9b692118ff 100644
--- a/ui/hunter/survival/apls/sv.apl.json
+++ b/ui/hunter/survival/apls/sv.apl.json
@@ -6,12 +6,13 @@
 		{ "action": { "castSpell": { "spellId": { "spellId": 77767 } } }, "doAtValue": { "const": { "val": "-1.4s" } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 13165 } } }, "doAtValue": { "const": { "val": "-10s" } } },
 		{ "action": { "castSpell": { "spellId": { "spellId": 1130 } } }, "doAtValue": { "const": { "val": "-3s" } } },
-		{ "action": { "castSpell": { "spellId": { "spellId": 53517 } } }, "doAtValue": { "const": { "val": "-4s" } }, "hide": true }
+		{ "action": { "castSpell": { "spellId": { "spellId": 53517 } } }, "doAtValue": { "const": { "val": "-4s" } }, "hide": true },
+		{ "action": { "triggerIcd": { "auraId": { "spellId": 97125 } } }, "doAtValue": { "const": { "val": "-40s" } }, "hide": true }
 	],
 	"priorityList": [
 		{
 			"action": {
-				"condition": { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "1s" } } } },
+				"condition": { "cmp": { "op": "OpGt", "lhs": { "currentTime": {} }, "rhs": { "const": { "val": "3s" } } } },
 				"autocastOtherCooldowns": {}
 			}
 		},
@@ -138,6 +139,7 @@
 				"castSpell": { "spellId": { "spellId": 3674 } }
 			}
 		},
+		{ "action": { "condition": { "auraIsActive": { "auraId": { "spellId": 99060 } } }, "castSpell": { "spellId": { "spellId": 34026 } } } },
 		{
 			"action": {
 				"condition": { "cmp": { "op": "OpGe", "lhs": { "currentFocus": {} }, "rhs": { "const": { "val": "80" } } } },
@@ -151,13 +153,27 @@
 						"vals": [
 							{ "cmp": { "op": "OpGe", "lhs": { "currentFocus": {} }, "rhs": { "const": { "val": "40" } } } },
 							{ "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "8s" } } } },
-							{ "cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 53301 } } }, "rhs": { "const": { "val": "3s" } } } }
+							{ "cmp": { "op": "OpGe", "lhs": { "spellTimeToReady": { "spellId": { "spellId": 53301 } } }, "rhs": { "const": { "val": "1s" } } } }
 						]
 					}
 				},
 				"castSpell": { "spellId": { "spellId": 3044 } }
 			}
 		},
+		{
+			"hide": true,
+			"action": {
+				"condition": {
+					"or": {
+						"vals": [
+							{ "isExecutePhase": { "threshold": "E20" } },
+							{ "cmp": { "op": "OpLe", "lhs": { "remainingTime": {} }, "rhs": { "const": { "val": "25s" } } } }
+						]
+					}
+				},
+				"castSpell": { "spellId": { "spellId": 3045 } }
+			}
+		},
 		{ "action": { "castSpell": { "spellId": { "spellId": 77767 } } } }
 	]
 }
diff --git a/ui/hunter/survival/apls/sv_advanced.apl.json b/ui/hunter/survival/apls/sv_advanced.apl.json
deleted file mode 100644
index 07a908171a..0000000000
--- a/ui/hunter/survival/apls/sv_advanced.apl.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"type": "TypeAPL",
-	 "prepullActions": [
-        {"action":{"castSpell":{"spellId":{"spellId":13812}}},"doAtValue":{"const":{"val":"-25s"}}},
-        {"action":{"castSpell":{"spellId":{"otherId":"OtherActionPotion"}}},"doAtValue":{"const":{"val":"-1.4s"}}},
-        {"action":{"castSpell":{"spellId":{"spellId":77767}}},"doAtValue":{"const":{"val":"-1.4s"}}},
-        {"action":{"castSpell":{"spellId":{"spellId":13165}}},"doAtValue":{"const":{"val":"-10s"}}},
-        {"action":{"castSpell":{"spellId":{"spellId":1130}}},"doAtValue":{"const":{"val":"-3s"}}},
-        {"action":{"castSpell":{"spellId":{"spellId":53517}}},"doAtValue":{"const":{"val":"-4s"}}}
-      ],
-      "priorityList": [
-        {"action":{"condition":{"cmp":{"op":"OpGt","lhs":{"currentTime":{}},"rhs":{"const":{"val":"1s"}}}},"autocastOtherCooldowns":{}}},
-        {"action":{"condition":{"or":{"vals":[{"isExecutePhase":{"threshold":"E20"}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"25s"}}}}]}},"castSpell":{"spellId":{"itemId":58145}}}},
-        {"action":{"condition":{"not":{"val":{"dotIsActive":{"spellId":{"spellId":1978}}}}},"castSpell":{"spellId":{"spellId":2643}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":53351}}}},
-        {"action":{"condition":{"and":{"vals":[{"dotIsActive":{"spellId":{"spellId":53301}}},{"cmp":{"op":"OpGe","lhs":{"dotRemainingTime":{"spellId":{"spellId":53301}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTravelTime":{"spellId":{"spellId":53301}}},"rhs":{"const":{"val":"1000ms"}}}}}},{"spellCanCast":{"spellId":{"spellId":53301}}},{"cmp":{"op":"OpLe","lhs":{"dotRemainingTime":{"spellId":{"spellId":53301}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTravelTime":{"spellId":{"spellId":53301}}},"rhs":{"const":{"val":"1050ms"}}}}}}]}},"wait":{"duration":{"const":{"val":"51ms"}}}}},
-        {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpLt","lhs":{"spellTimeToReady":{"spellId":{"spellId":53301}}},"rhs":{"const":{"val":"250ms"}}}},{"cmp":{"op":"OpGt","lhs":{"currentFocus":{}},"rhs":{"const":{"val":"44"}}}}]}},"waitUntil":{"condition":{"spellIsReady":{"spellId":{"spellId":53301}}}}}},
-        {"action":{"condition":{"or":{"vals":[{"not":{"val":{"dotIsActive":{"spellId":{"spellId":53301}}}}},{"cmp":{"op":"OpLt","lhs":{"dotRemainingTime":{"spellId":{"spellId":53301}}},"rhs":{"math":{"op":"OpAdd","lhs":{"spellTravelTime":{"spellId":{"spellId":53301}}},"rhs":{"const":{"val":"1000ms"}}}}}}]}},"castSpell":{"spellId":{"spellId":53301}}}},
-        {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}},{"spellIsReady":{"spellId":{"spellId":3674}}}]}},"castSpell":{"spellId":{"spellId":3674}}}},
-        {"action":{"condition":{"cmp":{"op":"OpGe","lhs":{"currentFocus":{}},"rhs":{"const":{"val":"80"}}}},"castSpell":{"spellId":{"spellId":3044}}}},
-        {"action":{"condition":{"and":{"vals":[{"cmp":{"op":"OpGe","lhs":{"currentFocus":{}},"rhs":{"const":{"val":"40"}}}},{"cmp":{"op":"OpLe","lhs":{"remainingTime":{}},"rhs":{"const":{"val":"8s"}}}},{"cmp":{"op":"OpGe","lhs":{"spellTimeToReady":{"spellId":{"spellId":53301}}},"rhs":{"const":{"val":"3s"}}}}]}},"castSpell":{"spellId":{"spellId":3044}}}},
-        {"action":{"castSpell":{"spellId":{"spellId":77767}}}}
-      ]
-}
diff --git a/ui/hunter/survival/gear_sets/p3_sv.gear.json b/ui/hunter/survival/gear_sets/p3_sv.gear.json
new file mode 100644
index 0000000000..6ebdcf2030
--- /dev/null
+++ b/ui/hunter/survival/gear_sets/p3_sv.gear.json
@@ -0,0 +1,21 @@
+{
+	"items": [
+		{ "id": 71503, "enchant": 4209, "gems": [68778, 52209], "reforging": 154 },
+		{ "id": 71610, "reforging": 152 },
+		{ "id": 71403, "randomSuffix": -294, "enchant": 4204, "gems": [52258], "reforging": 165 },
+		{ "id": 71415, "enchant": 4100, "gems": [52258, 52258], "reforging": 137 },
+		{ "id": 71501, "enchant": 4102, "gems": [52212, 52209] },
+		{ "id": 71561, "enchant": 4258, "gems": [52212], "reforging": 152 },
+		{ "id": 71502, "enchant": 4107, "gems": [52212, 52212], "reforging": 151 },
+		{ "id": 71255, "gems": [52212, 52212], "reforging": 152 },
+		{ "id": 71504, "enchant": 4126, "gems": [52212, 52220], "reforging": 152 },
+		{ "id": 71457, "enchant": 4105, "gems": [52212] },
+		{ "id": 71216, "gems": [52212], "reforging": 152 },
+		{ "id": 71401, "reforging": 152 },
+		{ "id": 69150 },
+		{ "id": 69112 },
+		{ "id": 71466, "enchant": 4227 },
+		{},
+		{ "id": 71611, "enchant": 4267, "reforging": 151 }
+	]
+}
diff --git a/ui/hunter/survival/presets.ts b/ui/hunter/survival/presets.ts
index 3bb46be3f6..d95ed86c6b 100644
--- a/ui/hunter/survival/presets.ts
+++ b/ui/hunter/survival/presets.ts
@@ -16,8 +16,8 @@ import { Stats } from '../../core/proto_utils/stats';
 import { ferocityDefault } from '../../core/talents/hunter_pet';
 import AoeApl from './apls/aoe.apl.json';
 import SvApl from './apls/sv.apl.json';
-import SvAdvApl from './apls/sv_advanced.apl.json';
 import P1SVGear from './gear_sets/p1_sv.gear.json';
+import P3SVGear from './gear_sets/p3_sv.gear.json';
 import PreraidSVGear from './gear_sets/preraid_sv.gear.json';
 
 // Preset options for this spec.
@@ -25,16 +25,10 @@ import PreraidSVGear from './gear_sets/preraid_sv.gear.json';
 // keep them in a separate file.
 
 export const SV_PRERAID_PRESET = PresetUtils.makePresetGear('SV PreRaid Preset', PreraidSVGear);
-export const SV_P1_PRESET = PresetUtils.makePresetGear('SV P1 Preset', P1SVGear);
-export const DefaultSimpleRotation = HunterRotation.create({
-	type: RotationType.SingleTarget,
-	sting: HunterStingType.SerpentSting,
-	multiDotSerpentSting: true,
-});
+export const SV_P1_PRESET = PresetUtils.makePresetGear('SV T11 Preset', P1SVGear);
+export const SV_P3_PRESET = PresetUtils.makePresetGear('SV T12 Preset', P3SVGear);
 
-export const ROTATION_PRESET_SIMPLE_DEFAULT = PresetUtils.makePresetSimpleRotation('Simple Default', Spec.SpecSurvivalHunter, DefaultSimpleRotation);
 export const ROTATION_PRESET_SV = PresetUtils.makePresetAPLRotation('SV', SvApl);
-export const ROTATION_PRESET_SV_ADVANCED = PresetUtils.makePresetAPLRotation('SV (Advanced)', SvAdvApl);
 export const ROTATION_PRESET_AOE = PresetUtils.makePresetAPLRotation('AOE', AoeApl);
 
 // Preset options for EP weights
@@ -56,8 +50,8 @@ export const P1_EP_PRESET = PresetUtils.makePresetEpWeights(
 	),
 );
 
-export const P2_EP_PRESET = PresetUtils.makePresetEpWeights(
-	'SV P2 (T12 4 set)',
+export const P3_EP_PRESET = PresetUtils.makePresetEpWeights(
+	'SV P3 (T12 4 set)',
 	Stats.fromMap(
 		{
 			[Stat.StatStamina]: 0.5,
@@ -80,7 +74,7 @@ export const P2_EP_PRESET = PresetUtils.makePresetEpWeights(
 export const SurvivalTalents = {
 	name: 'Survival',
 	data: SavedTalents.create({
-		talentsString: '03-2302-23203003023022121311',
+		talentsString: '03-2302-03203203023022121311',
 		glyphs: Glyphs.create({
 			prime1: PrimeGlyph.GlyphOfExplosiveShot,
 			prime2: PrimeGlyph.GlyphOfKillShot,
diff --git a/ui/hunter/survival/sim.ts b/ui/hunter/survival/sim.ts
index e6213a4761..f518fb556b 100644
--- a/ui/hunter/survival/sim.ts
+++ b/ui/hunter/survival/sim.ts
@@ -60,9 +60,9 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecSurvivalHunter, {
 
 	defaults: {
 		// Default equipped gear.
-		gear: Presets.SV_P1_PRESET.gear,
+		gear: Presets.SV_P3_PRESET.gear,
 		// Default EP weights for sorting gear in the gear picker.
-		epWeights: Presets.P1_EP_PRESET.epWeights,
+		epWeights: Presets.P3_EP_PRESET.epWeights,
 		// Default stat caps for the Reforge Optimizer
 		statCaps: (() => {
 			const hitCap = new Stats().withPseudoStat(PseudoStat.PseudoStatPhysicalHitPercent, 8);
@@ -132,13 +132,13 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecSurvivalHunter, {
 	},
 
 	presets: {
-		epWeights: [Presets.P1_EP_PRESET],
+		epWeights: [Presets.P1_EP_PRESET, Presets.P3_EP_PRESET],
 		// Preset talents that the user can quickly select.
 		talents: [Presets.SurvivalTalents],
 		// Preset rotations that the user can quickly select.
-		rotations: [Presets.ROTATION_PRESET_SIMPLE_DEFAULT, Presets.ROTATION_PRESET_SV, Presets.ROTATION_PRESET_SV_ADVANCED, Presets.ROTATION_PRESET_AOE],
+		rotations: [Presets.ROTATION_PRESET_SV, Presets.ROTATION_PRESET_AOE],
 		// Preset gear configurations that the user can quickly select.
-		gear: [Presets.SV_PRERAID_PRESET, Presets.SV_P1_PRESET],
+		gear: [Presets.SV_P3_PRESET, Presets.SV_P1_PRESET, Presets.SV_PRERAID_PRESET],
 	},
 
 	autoRotation: (player: Player<Spec.SpecSurvivalHunter>): APLRotation => {
@@ -251,7 +251,10 @@ export class SurvivalHunterSimUI extends IndividualSimUI<Spec.SpecSurvivalHunter
 					if (player.getGear().getItemSetCount('Lightning-Charged Battlegear') >= 4) {
 						return Presets.P1_EP_PRESET.epWeights;
 					}
-					return Presets.P2_EP_PRESET.epWeights;
+					if (player.getGear().getItemSetCount("Flamewaker's Battlegear") >= 4) {
+						return Presets.P3_EP_PRESET.epWeights;
+					}
+					return Presets.P1_EP_PRESET.epWeights;
 				},
 			});
 		});