diff --git a/sim/rogue/dps_rogue/TestCombatDaggers.results b/sim/rogue/dps_rogue/TestCombatDaggers.results
index c6f53ed69..a8aca47b5 100644
--- a/sim/rogue/dps_rogue/TestCombatDaggers.results
+++ b/sim/rogue/dps_rogue/TestCombatDaggers.results
@@ -1,9 +1,9 @@
 character_stats_results: {
  key: "TestCombatDaggers-Phase5-CharacterStats-Default"
  value: {
-  final_stats: 259.325
-  final_stats: 452.87
-  final_stats: 453.882
+  final_stats: 249.205
+  final_stats: 461.725
+  final_stats: 517.891
   final_stats: 127.765
   final_stats: 197.90925
   final_stats: 0
@@ -18,24 +18,24 @@ character_stats_results: {
   final_stats: 21
   final_stats: 0
   final_stats: 0
-  final_stats: 1935.195
-  final_stats: 9
-  final_stats: 44.62402
+  final_stats: 1893.93
+  final_stats: 11
+  final_stats: 45.92951
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 2310.74
-  final_stats: 1148.87
+  final_stats: 2471.45
+  final_stats: 1117.725
   final_stats: 0
   final_stats: 5
   final_stats: 0
-  final_stats: 34.24803
+  final_stats: 34.85903
   final_stats: 5
   final_stats: 0
-  final_stats: 6181.82
+  final_stats: 6821.91
   final_stats: 27
   final_stats: 60
   final_stats: 60
@@ -50,8 +50,8 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestCombatDaggers-Phase5-StatWeights-Default"
  value: {
-  weights: 0.4147
-  weights: 0.51313
+  weights: 0.44582
+  weights: 0.78889
   weights: 0
   weights: 0
   weights: 0
@@ -67,9 +67,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.32782
-  weights: 12.66673
-  weights: 1.79148
+  weights: 0.35242
+  weights: 9.4274
+  weights: 5.01117
   weights: 0
   weights: 0
   weights: 0
@@ -99,168 +99,168 @@ stat_weights_results: {
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-BloodfangArmor"
  value: {
-  dps: 1008.01124
-  tps: 715.68798
+  dps: 1062.78079
+  tps: 754.57436
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-BonescytheArmor"
  value: {
-  dps: 1111.47914
-  tps: 771.0513
+  dps: 1172.52514
+  tps: 814.66332
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-Champion'sGuard"
  value: {
-  dps: 951.86163
-  tps: 675.82176
+  dps: 984.11024
+  tps: 698.71827
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-DarkmantleArmor"
  value: {
-  dps: 1003.38314
-  tps: 712.40203
+  dps: 1066.87581
+  tps: 757.48183
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-Deathdealer'sEmbrace"
  value: {
-  dps: 1014.36299
-  tps: 720.19773
+  dps: 1069.36265
+  tps: 759.24748
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-FieldMarshal'sVestments"
  value: {
-  dps: 980.51726
-  tps: 696.16726
+  dps: 1032.44508
+  tps: 733.036
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-LieutenantCommander'sGuard"
  value: {
-  dps: 951.86163
-  tps: 675.82176
+  dps: 984.11024
+  tps: 698.71827
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-Madcap'sOutfit"
  value: {
-  dps: 949.34829
-  tps: 674.03729
+  dps: 994.1002
+  tps: 705.81114
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-NightslayerArmor"
  value: {
-  dps: 953.69678
-  tps: 677.12471
+  dps: 1008.6079
+  tps: 716.11161
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-AllItems-Warlord'sVestments"
  value: {
-  dps: 980.51726
-  tps: 696.16726
+  dps: 1032.44508
+  tps: 733.036
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Average-Default"
  value: {
-  dps: 953.11799
-  tps: 676.71377
+  dps: 1006.61431
+  tps: 714.69616
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 343.11029
-  tps: 243.60831
+  dps: 342.64027
+  tps: 243.27459
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 287.74263
-  tps: 204.29727
+  dps: 287.35637
+  tps: 204.02302
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 367.73363
-  tps: 261.09088
+  dps: 365.28862
+  tps: 259.35492
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 158.99959
-  tps: 112.88971
+  dps: 157.43552
+  tps: 111.77922
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 135.3063
-  tps: 96.06747
+  dps: 134.1389
+  tps: 95.23862
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Human-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 172.80531
-  tps: 122.69177
+  dps: 170.99944
+  tps: 121.40961
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 348.87683
-  tps: 247.70255
+  dps: 348.93851
+  tps: 247.74634
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 285.90747
-  tps: 202.9943
+  dps: 286.03493
+  tps: 203.0848
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 367.85945
-  tps: 261.18021
+  dps: 369.15227
+  tps: 262.09811
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 163.07044
-  tps: 115.78001
+  dps: 161.39798
+  tps: 114.59256
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 136.00811
-  tps: 96.56576
+  dps: 134.74778
+  tps: 95.67092
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-Settings-Orc-combat_backstab_prebis-No Poisons-combat_backstab-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 176.04493
-  tps: 124.9919
+  dps: 174.27099
+  tps: 123.7324
  }
 }
 dps_results: {
  key: "TestCombatDaggers-Phase5-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 348.02382
-  tps: 247.09691
+  dps: 388.4956
+  tps: 275.83188
  }
 }
diff --git a/sim/rogue/dps_rogue/TestCombatSinisterStrike.results b/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
index 2a33e8a47..1a389efcc 100644
--- a/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
+++ b/sim/rogue/dps_rogue/TestCombatSinisterStrike.results
@@ -1,11 +1,11 @@
 character_stats_results: {
  key: "TestCombatSinisterStrike-Phase5-CharacterStats-Default"
  value: {
-  final_stats: 227.7
-  final_stats: 454.135
-  final_stats: 485.8865
+  final_stats: 254.265
+  final_stats: 475.64
+  final_stats: 507.70775
   final_stats: 127.765
-  final_stats: 200.56575
+  final_stats: 197.90925
   final_stats: 0
   final_stats: 0
   final_stats: 0
@@ -18,24 +18,24 @@ character_stats_results: {
   final_stats: 21
   final_stats: 0
   final_stats: 0
-  final_stats: 1864.835
-  final_stats: 7
-  final_stats: 42.66766
+  final_stats: 1914.905
+  final_stats: 9
+  final_stats: 43.40958
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
   final_stats: 0
-  final_stats: 2411.27
-  final_stats: 1110.135
+  final_stats: 2599.28
+  final_stats: 1133.64
   final_stats: 7
   final_stats: 5.28
   final_stats: 0
-  final_stats: 35.61532
+  final_stats: 37.09916
   final_stats: 5.28
   final_stats: 0
-  final_stats: 6501.865
+  final_stats: 6720.0775
   final_stats: 27
   final_stats: 60
   final_stats: 60
@@ -50,8 +50,8 @@ character_stats_results: {
 stat_weights_results: {
  key: "TestCombatSinisterStrike-Phase5-StatWeights-Default"
  value: {
-  weights: 0.44711
-  weights: 0.50728
+  weights: 0.45983
+  weights: 0.81833
   weights: 0
   weights: 0
   weights: 0
@@ -67,9 +67,9 @@ stat_weights_results: {
   weights: 0
   weights: 0
   weights: 0
-  weights: 0.35345
-  weights: 12.61245
-  weights: 2.46698
+  weights: 0.36351
+  weights: 10.34575
+  weights: 6.42015
   weights: 0
   weights: 0
   weights: 0
@@ -99,168 +99,168 @@ stat_weights_results: {
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-BloodfangArmor"
  value: {
-  dps: 1060.32096
-  tps: 752.82788
+  dps: 1066.94208
+  tps: 757.52888
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-BonescytheArmor"
  value: {
-  dps: 1170.52145
-  tps: 814.19968
+  dps: 1179.86194
+  tps: 820.6033
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-Champion'sGuard"
  value: {
-  dps: 965.37804
-  tps: 685.41841
+  dps: 981.45571
+  tps: 696.83355
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-DarkmantleArmor"
  value: {
-  dps: 1058.47528
-  tps: 751.51745
+  dps: 1070.58658
+  tps: 760.11647
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-Deathdealer'sEmbrace"
  value: {
-  dps: 1072.09324
-  tps: 761.1862
+  dps: 1078.95523
+  tps: 766.05822
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-FieldMarshal'sVestments"
  value: {
-  dps: 1018.98979
-  tps: 723.48275
+  dps: 1033.16916
+  tps: 733.5501
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-LieutenantCommander'sGuard"
  value: {
-  dps: 965.37804
-  tps: 685.41841
+  dps: 981.45571
+  tps: 696.83355
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-Madcap'sOutfit"
  value: {
-  dps: 1004.1078
-  tps: 712.91654
+  dps: 1011.59214
+  tps: 718.23042
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-NightslayerArmor"
  value: {
-  dps: 1002.09227
-  tps: 711.48551
+  dps: 1009.29883
+  tps: 716.60217
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-AllItems-Warlord'sVestments"
  value: {
-  dps: 1018.98979
-  tps: 723.48275
+  dps: 1033.16916
+  tps: 733.5501
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Average-Default"
  value: {
-  dps: 961.73884
-  tps: 682.83457
+  dps: 1006.04864
+  tps: 714.29453
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 310.42465
-  tps: 220.4015
+  dps: 317.0878
+  tps: 225.13234
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 260.14267
-  tps: 184.7013
+  dps: 265.74898
+  tps: 188.68177
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 330.14895
-  tps: 234.40575
+  dps: 336.43475
+  tps: 238.86868
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 133.93895
-  tps: 95.09666
+  dps: 137.02488
+  tps: 97.28766
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 114.15907
-  tps: 81.05294
+  dps: 116.67941
+  tps: 82.84238
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Human-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 143.32615
-  tps: 101.76157
+  dps: 147.11931
+  tps: 104.45471
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 313.5119
-  tps: 222.59345
+  dps: 320.30553
+  tps: 227.41693
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 257.51075
-  tps: 182.83263
+  dps: 262.91331
+  tps: 186.66845
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-FullBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 325.1895
-  tps: 230.88455
+  dps: 332.80624
+  tps: 236.29243
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongMultiTarget"
  value: {
-  dps: 136.88867
-  tps: 97.19096
+  dps: 140.25165
+  tps: 99.57867
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-LongSingleTarget"
  value: {
-  dps: 114.46783
-  tps: 81.27216
+  dps: 117.0743
+  tps: 83.12275
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-Settings-Orc-combat_sinister_strike_prebis-No Poisons-combat_sinister_strike-NoBuffs-P1-Consumes-ShortSingleTarget"
  value: {
-  dps: 143.52323
-  tps: 101.90149
+  dps: 147.88566
+  tps: 104.99882
  }
 }
 dps_results: {
  key: "TestCombatSinisterStrike-Phase5-SwitchInFrontOfTarget-Default"
  value: {
-  dps: 727.06041
-  tps: 516.21289
+  dps: 766.70501
+  tps: 544.36056
  }
 }
diff --git a/ui/hunter/presets.ts b/ui/hunter/presets.ts
index 7620d4f18..7decdfc3f 100644
--- a/ui/hunter/presets.ts
+++ b/ui/hunter/presets.ts
@@ -28,6 +28,7 @@ import {
 	Hunter_Options as HunterOptions,
 	Hunter_Options_Ammo as Ammo,
 	Hunter_Options_PetType as PetType,
+	Hunter_Options_PetAttackSpeed as PetAttackSpeed,
 	Hunter_Options_QuiverBonus,
 } from '../core/proto/hunter.js';
 import { SavedTalents } from '../core/proto/ui.js';
@@ -85,8 +86,8 @@ export const DefaultTalents = TalentPresets[Phase.Phase1][0];
 export const DefaultOptions = HunterOptions.create({
 	ammo: Ammo.ThoriumHeadedArrow,
 	quiverBonus: Hunter_Options_QuiverBonus.Speed15,
-	petAttackSpeed: 2.0,
-	petType: PetType.PetNone,
+	petAttackSpeed: PetAttackSpeed.OneTwo,
+	petType: PetType.Cat,
 	petUptime: 1,
 });
 
diff --git a/ui/rogue/gear_sets/combat_backstab_p2_bis.gear.json b/ui/rogue/gear_sets/combat_backstab_p2_bis.gear.json
new file mode 100644
index 000000000..5ea18bdeb
--- /dev/null
+++ b/ui/rogue/gear_sets/combat_backstab_p2_bis.gear.json
@@ -0,0 +1,19 @@
+{"items":  [
+    {"id":16908,"enchant":1508},
+    {"id":18404},
+    {"id":16708},
+    {"id":18541,"enchant":849},
+    {"id":16721,"enchant":1891},
+    {"id":16710,"enchant":1885},
+    {"id":18823,"enchant":1887},
+    {"id":16713},
+    {"id":16709,"enchant":1508},
+    {"id":16711,"enchant":1887},
+    {"id":17063},
+    {"id":19325},
+    {"id":13965},
+    {"id":11815},
+    {"id":18816,"enchant":1900},
+    {"id":18805,"enchant":1900},
+    {"id":17069}
+]}
\ No newline at end of file
diff --git a/ui/rogue/gear_sets/combat_backstab_prebis.gear.json b/ui/rogue/gear_sets/combat_backstab_prebis.gear.json
index 1c5e7fed5..7ee4b284d 100644
--- a/ui/rogue/gear_sets/combat_backstab_prebis.gear.json
+++ b/ui/rogue/gear_sets/combat_backstab_prebis.gear.json
@@ -1,19 +1,19 @@
 {"items":  [
     {"id":16707,"enchant":1508},
-    {"id":15411},
-    {"id":12927},
+    {"id":22150},
+    {"id":23313},
     {"id":13340,"enchant":849},
-    {"id":14637,"enchant":1891},
+    {"id":23298,"enchant":1891},
     {"id":16710,"enchant":1885},
     {"id":16712,"enchant":1887},
     {"id":16713},
     {"id":16709,"enchant":1508},
     {"id":16711,"enchant":1887},
-    {"id":13098},
-    {"id":17713},
+    {"id":19325},
+    {"id":18500},
     {"id":13965},
     {"id":11815},
     {"id":12590,"enchant":1900},
-    {"id":13368,"enchant":1900},
-    {"id":12651}
+    {"id":18392,"enchant":1900},
+    {"id":18323}
 ]}
\ No newline at end of file
diff --git a/ui/rogue/gear_sets/combat_sinister_strike_p2_bis.gear.json b/ui/rogue/gear_sets/combat_sinister_strike_p2_bis.gear.json
new file mode 100644
index 000000000..4294b37a4
--- /dev/null
+++ b/ui/rogue/gear_sets/combat_sinister_strike_p2_bis.gear.json
@@ -0,0 +1,19 @@
+{"items":  [
+    {"id":16908,"enchant":1508},
+    {"id":18404},
+    {"id":16823},
+    {"id":18541,"enchant":849},
+    {"id":16820,"enchant":1891},
+    {"id":16825,"enchant":1885},
+    {"id":16826,"enchant":1887},
+    {"id":16827},
+    {"id":16909,"enchant":1508},
+    {"id":16824,"enchant":1887},
+    {"id":17063},
+    {"id":19325},
+    {"id":13965},
+    {"id":11815},
+    {"id":17075,"enchant":1900},
+    {"id":18832,"enchant":1900},
+    {"id":17069}
+]}
diff --git a/ui/rogue/gear_sets/combat_sinister_strike_prebis.gear.json b/ui/rogue/gear_sets/combat_sinister_strike_prebis.gear.json
index 15a251091..862e2f8a4 100644
--- a/ui/rogue/gear_sets/combat_sinister_strike_prebis.gear.json
+++ b/ui/rogue/gear_sets/combat_sinister_strike_prebis.gear.json
@@ -1,19 +1,19 @@
 {"items":  [
     {"id":16707,"enchant":1508},
     {"id":15411},
-    {"id":16708},
+    {"id":23258},
     {"id":13340,"enchant":849},
-    {"id":16721,"enchant":1891},
+    {"id":22879,"enchant":1891},
     {"id":16710,"enchant":1885},
-    {"id":15063,"enchant":1887},
+    {"id":16712,"enchant":1887},
     {"id":16713},
-    {"id":15062,"enchant":1508},
+    {"id":16709,"enchant":1508},
     {"id":16711,"enchant":1887},
-    {"id":13098},
-    {"id":17713},
+    {"id":19325},
+    {"id":18500},
     {"id":13965},
     {"id":11815},
     {"id":12940,"enchant":1900},
     {"id":12939,"enchant":1900},
-    {"id":12651}
+    {"id":2100}
 ]}
diff --git a/ui/rogue/presets.ts b/ui/rogue/presets.ts
index e2879c477..c42cc1da3 100644
--- a/ui/rogue/presets.ts
+++ b/ui/rogue/presets.ts
@@ -17,6 +17,7 @@ import {
 	TristateEffect,
 	WeaponImbue,
 	ZanzaBuff,
+	SapperExplosive,
 } from '../core/proto/common.js';
 import { RogueOptions } from '../core/proto/rogue.js';
 import { SavedTalents } from '../core/proto/ui.js';
@@ -29,7 +30,9 @@ import BlankGear from './gear_sets/blank.gear.json';
 import BackstabGearPreBiS from './gear_sets/combat_backstab_prebis.gear.json';
 import SinisterStrikeGearPreBiS from './gear_sets/combat_sinister_strike_prebis.gear.json';
 import BackstabGearP1BiS from './gear_sets/combat_backstab_p1_bis.gear.json';
+import BackstabGearP2BiS from './gear_sets/combat_backstab_p2_bis.gear.json';
 import SinisterStrikeGearP1BiS from './gear_sets/combat_sinister_strike_p1_bis.gear.json';
+import SinisterStrikeGearP2BiS from './gear_sets/combat_sinister_strike_p2_bis.gear.json';
 
 // Preset options for this spec.
 // Eventually we will import these values for the raid sim too, so its good to
@@ -43,10 +46,13 @@ export const GearBlank = PresetUtils.makePresetGear('Blank', BlankGear);
 export const GearBackstabPreBiS = PresetUtils.makePresetGear('Backstab Pre-BiS', BackstabGearPreBiS);
 export const GearSinisterStrikePreBiS = PresetUtils.makePresetGear('Sinister Strike Pre-BiS', SinisterStrikeGearPreBiS);
 export const GearBackstabP1BiS = PresetUtils.makePresetGear('Backstab P1 BiS', BackstabGearP1BiS);
+export const GearBackstabP2BiS = PresetUtils.makePresetGear('Backstab P2 BiS', BackstabGearP2BiS);
 export const GearSinisterStrikeP1BiS = PresetUtils.makePresetGear('Sinister Strike P1 BiS', SinisterStrikeGearP1BiS);
+export const GearSinisterStrikeP2BiS = PresetUtils.makePresetGear('Sinister Strike P2 BiS', SinisterStrikeGearP2BiS);
 
 export const GearPresets = {
 	[Phase.Phase1]: [GearBackstabPreBiS, GearSinisterStrikePreBiS, GearBackstabP1BiS, GearSinisterStrikeP1BiS],
+	[Phase.Phase2]: [GearBackstabPreBiS, GearSinisterStrikePreBiS, GearBackstabP2BiS, GearSinisterStrikeP2BiS],
 };
 
 export const DefaultGear = GearSinisterStrikePreBiS;
@@ -63,6 +69,7 @@ export const ROTATION_PRESET_SINISTER_STRIKE_IEA = PresetUtils.makePresetAPLRota
 
 export const APLPresets = {
 	[Phase.Phase1]: [ROTATION_PRESET_BACKSTAB, ROTATION_PRESET_SINISTER_STRIKE, ROTATION_PRESET_BACKSTAB_SWEATY, ROTATION_PRESET_SINISTER_STRIKE_SWEATY, ROTATION_PRESET_SINISTER_STRIKE_IEA],
+	[Phase.Phase2]: [ROTATION_PRESET_BACKSTAB, ROTATION_PRESET_SINISTER_STRIKE, ROTATION_PRESET_BACKSTAB_SWEATY, ROTATION_PRESET_SINISTER_STRIKE_SWEATY, ROTATION_PRESET_SINISTER_STRIKE_IEA],
 };
 
 //Need to add main hand equip logic or talent/rotation logic to map to Auto APL
@@ -71,9 +78,9 @@ export const DefaultAPLs: Record<number, PresetUtils.PresetRotation> = {
 	[1]: ROTATION_PRESET_BACKSTAB,
 };
 
-export const DefaultAPLBackstab = APLPresets[Phase.Phase1][0];
-export const DefaultAPLSinisterStrike = APLPresets[Phase.Phase1][1];
-export const DefaultAPLIEA = APLPresets[Phase.Phase1][4];
+export const DefaultAPLBackstab = APLPresets[Phase.Phase2][0];
+export const DefaultAPLSinisterStrike = APLPresets[Phase.Phase2][1];
+export const DefaultAPLIEA = APLPresets[Phase.Phase2][4];
 
 ///////////////////////////////////////////////////////////////////////////
 //                                 Talent Presets
@@ -88,22 +95,21 @@ export const CombatBackstabTalents = PresetUtils.makePresetTalents(
 	'Backstab',
 	SavedTalents.create({ talentsString: '005023104-0233050020550100221-05' }),
 );
-
 export const CombatSinisterStrikeTalents = PresetUtils.makePresetTalents('Sinister Strike', SavedTalents.create({ talentsString: '005323105-0240052020050150231' }));
-
 export const CombatSinisterStrikeIEATalents = PresetUtils.makePresetTalents('Improved Expose Armor (SS)', SavedTalents.create({ talentsString: '005323123-0240052020050150231' }));
 
 export const TalentPresets = {
 	[Phase.Phase1]: [CombatBackstabTalents, CombatSinisterStrikeTalents, CombatSinisterStrikeIEATalents],
+	[Phase.Phase2]: [CombatBackstabTalents, CombatSinisterStrikeTalents, CombatSinisterStrikeIEATalents],
 };
 
-export const DefaultTalentsAssassin = TalentPresets[Phase.Phase1][0];
-export const DefaultTalentsCombat = TalentPresets[Phase.Phase1][0];
-export const DefaultTalentsSubtlety = TalentPresets[Phase.Phase1][0];
+export const DefaultTalentsAssassin = TalentPresets[Phase.Phase2][0];
+export const DefaultTalentsCombat = TalentPresets[Phase.Phase2][0];
+export const DefaultTalentsSubtlety = TalentPresets[Phase.Phase2][0];
 
-export const DefaultTalentsBackstab = TalentPresets[Phase.Phase1][0];
-export const DefaultTalentsSinisterStrike = TalentPresets[Phase.Phase1][1];
-export const DefaultTalentsIEA = TalentPresets[Phase.Phase1][2];
+export const DefaultTalentsBackstab = TalentPresets[Phase.Phase2][0];
+export const DefaultTalentsSinisterStrike = TalentPresets[Phase.Phase2][1];
+export const DefaultTalentsIEA = TalentPresets[Phase.Phase2][2];
 
 export const DefaultTalents = DefaultTalentsSinisterStrike;
 
@@ -111,17 +117,17 @@ export const DefaultTalents = DefaultTalentsSinisterStrike;
 //                                Build Presets
 ///////////////////////////////////////////////////////////////////////////
 export const PresetBuildBackstab = PresetUtils.makePresetBuild('Backstab', {
-	gear: GearBackstabP1BiS,
+	gear: GearBackstabP2BiS,
 	talents: DefaultTalentsBackstab,
 	rotation: DefaultAPLBackstab,
 });
 export const PresetBuildSinisterStrike = PresetUtils.makePresetBuild('Sinister Strike', {
-	gear: GearSinisterStrikeP1BiS,
+	gear: GearSinisterStrikeP2BiS,
 	talents: DefaultTalentsSinisterStrike,
 	rotation: DefaultAPLSinisterStrike,
 });
 export const PresetBuildIEA = PresetUtils.makePresetBuild('IEA', {
-	gear: GearSinisterStrikeP1BiS,
+	gear: GearSinisterStrikeP2BiS,
 	talents: DefaultTalentsIEA,
 	rotation: DefaultAPLIEA,
 });
@@ -143,11 +149,12 @@ export const P1Consumes = Consumes.create({
 	dragonBreathChili: true,
 	flask: Flask.FlaskOfSupremePower,
 	food: Food.FoodGrilledSquid,
-	mainHandImbue: WeaponImbue.Windfury,
-	offHandImbue: WeaponImbue.InstantPoison,
+	mainHandImbue: WeaponImbue.InstantPoison,
+	offHandImbue: WeaponImbue.DeadlyPoison,
 	spellPowerBuff: SpellPowerBuff.GreaterArcaneElixir,
 	strengthBuff: StrengthBuff.JujuPower,
 	zanzaBuff: ZanzaBuff.GroundScorpokAssay,
+	sapperExplosive: SapperExplosive.SapperGoblinSapper,
 });
 
 export const DefaultConsumes = {
@@ -162,6 +169,7 @@ export const P1RaidBuffs = RaidBuffs.create({
 	strengthOfEarthTotem: TristateEffect.TristateEffectImproved,
 	graceOfAirTotem: TristateEffect.TristateEffectImproved,
 	leaderOfThePack: true,
+	trueshotAura: true, 
 });
 
 export const DefaultRaidBuffs = {
@@ -173,10 +181,10 @@ export const P1IndividualBuffs = IndividualBuffs.create({
 	blessingOfMight: TristateEffect.TristateEffectImproved,
 	fengusFerocity: true,
 	rallyingCryOfTheDragonslayer: true,
-	saygesFortune: SaygesFortune.SaygesDamage,
+	//saygesFortune: SaygesFortune.SaygesDamage,
 	slipkiksSavvy: true,
 	songflowerSerenade: true,
-	spiritOfZandalar: true,
+	spiritOfZandalar: false,
 	warchiefsBlessing: true,
 });
 
diff --git a/ui/rogue/sim.ts b/ui/rogue/sim.ts
index 18ce921a8..4cd379197 100644
--- a/ui/rogue/sim.ts
+++ b/ui/rogue/sim.ts
@@ -139,15 +139,15 @@ const SPEC_CONFIG = registerSpecConfig(Spec.SpecRogue, {
 	presets: {
 		// Preset talents that the user can quickly select.
 		talents: [
-			...Presets.TalentPresets[Phase.Phase1],
+			...Presets.TalentPresets[Phase.Phase2],
 		],
 		// Preset rotations that the user can quickly select.
 		rotations: [
-			...Presets.APLPresets[Phase.Phase1],
+			...Presets.APLPresets[Phase.Phase2],
 		],
 		// Preset gear configurations that the user can quickly select.
 		gear: [
-			...Presets.GearPresets[Phase.Phase1],
+			...Presets.GearPresets[Phase.Phase2],
 		],
 		builds: [
 			Presets.PresetBuildBackstab,