diff --git a/QuestPaths/5.x - Shadowbringers/Aether Currents/Amh Araeng/3511_Charmless Man.json b/QuestPaths/5.x - Shadowbringers/Aether Currents/Amh Araeng/3511_Charmless Man.json
index 3de20e02..52dbdbfe 100644
--- a/QuestPaths/5.x - Shadowbringers/Aether Currents/Amh Araeng/3511_Charmless Man.json	
+++ b/QuestPaths/5.x - Shadowbringers/Aether Currents/Amh Araeng/3511_Charmless Man.json	
@@ -35,6 +35,17 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "DataId": 1030979,
+          "Position": {
+            "X": -424.61285,
+            "Y": 31.900826,
+            "Z": -226.64227
+          },
+          "TerritoryId": 815,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3503
+        },
         {
           "DataId": 1030807,
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3398_Delightful Decorations.json b/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3398_Delightful Decorations.json
index cef64c1d..0011e9c6 100644
--- a/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3398_Delightful Decorations.json	
+++ b/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3398_Delightful Decorations.json	
@@ -27,8 +27,7 @@
             "Z": -194.937
           },
           "TerritoryId": 816,
-          "InteractionType": "Dive",
-          "Comment": "TODO: Verify diving works here"
+          "InteractionType": "Dive"
         },
         {
           "DataId": 2010160,
@@ -116,7 +115,8 @@
           },
           "TerritoryId": 816,
           "InteractionType": "WalkTo",
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "Mount": true
         },
         {
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3404_The Path to Popularity.json b/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3404_The Path to Popularity.json
index 85586a61..e005cb36 100644
--- a/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3404_The Path to Popularity.json	
+++ b/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3404_The Path to Popularity.json	
@@ -91,6 +91,22 @@
         }
       ]
     },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1030838,
+          "Position": {
+            "X": -285.90833,
+            "Y": 40.324036,
+            "Z": 444.41882
+          },
+          "TerritoryId": 816,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Il Mheg - Lydha Lran"
+        }
+      ]
+    },
     {
       "Sequence": 255,
       "Steps": [
diff --git a/QuestPaths/5.x - Shadowbringers/Aether Currents/Kholusia/3360_A Plankless Task.json b/QuestPaths/5.x - Shadowbringers/Aether Currents/Kholusia/3360_A Plankless Task.json
index 61829403..cf48cb7b 100644
--- a/QuestPaths/5.x - Shadowbringers/Aether Currents/Kholusia/3360_A Plankless Task.json	
+++ b/QuestPaths/5.x - Shadowbringers/Aether Currents/Kholusia/3360_A Plankless Task.json	
@@ -80,7 +80,8 @@
             null,
             null,
             128
-          ]
+          ],
+          "DelaySecondsAtStart": 1
         },
         {
           "DataId": 2010286,
@@ -99,7 +100,8 @@
             null,
             null,
             32
-          ]
+          ],
+          "DelaySecondsAtStart": 1
         },
         {
           "DataId": 2010287,
@@ -118,7 +120,8 @@
             null,
             null,
             16
-          ]
+          ],
+          "DelaySecondsAtStart": 1
         },
         {
           "DataId": 2010288,
@@ -137,7 +140,8 @@
             null,
             null,
             8
-          ]
+          ],
+          "DelaySecondsAtStart": 1
         },
         {
           "DataId": 2010261,
@@ -156,7 +160,8 @@
             null,
             null,
             64
-          ]
+          ],
+          "DelaySecondsAtStart": 1
         },
         {
           "DataId": 2010289,
@@ -175,7 +180,8 @@
             null,
             null,
             4
-          ]
+          ],
+          "DelaySecondsAtStart": 1
         }
       ]
     },
diff --git a/QuestPaths/5.x - Shadowbringers/Aether Currents/Kholusia/3537_Fugitive of Fear.json b/QuestPaths/5.x - Shadowbringers/Aether Currents/Kholusia/3537_Fugitive of Fear.json
index ca916173..fffd4d93 100644
--- a/QuestPaths/5.x - Shadowbringers/Aether Currents/Kholusia/3537_Fugitive of Fear.json	
+++ b/QuestPaths/5.x - Shadowbringers/Aether Currents/Kholusia/3537_Fugitive of Fear.json	
@@ -42,7 +42,8 @@
             "Z": -15.381194
           },
           "TerritoryId": 814,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "Mount": true
         },
         {
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/Aether Currents/Lakeland/3386_An Unreasonable Request.json b/QuestPaths/5.x - Shadowbringers/Aether Currents/Lakeland/3386_An Unreasonable Request.json
index 7a5640ea..64f15cc9 100644
--- a/QuestPaths/5.x - Shadowbringers/Aether Currents/Lakeland/3386_An Unreasonable Request.json	
+++ b/QuestPaths/5.x - Shadowbringers/Aether Currents/Lakeland/3386_An Unreasonable Request.json	
@@ -40,6 +40,7 @@
           },
           "TerritoryId": 813,
           "InteractionType": "Interact",
+          "Mount": true,
           "DialogueChoices": [
             {
               "Type": "List",
@@ -53,6 +54,26 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "Position": {
+            "X": -159.60991,
+            "Y": 28.47209,
+            "Z": -130.60031
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "Mount": true
+        },
+        {
+          "Position": {
+            "X": -159.76884,
+            "Y": 32.30582,
+            "Z": -122.91172
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true
+        },
         {
           "DataId": 1028317,
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/Aether Currents/Tempest/3594_Community Cohesion.json b/QuestPaths/5.x - Shadowbringers/Aether Currents/Tempest/3594_Community Cohesion.json
index dc8bdeaa..93e5ec84 100644
--- a/QuestPaths/5.x - Shadowbringers/Aether Currents/Tempest/3594_Community Cohesion.json	
+++ b/QuestPaths/5.x - Shadowbringers/Aether Currents/Tempest/3594_Community Cohesion.json	
@@ -35,6 +35,15 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "Position": {
+            "X": -450.6779,
+            "Y": -250.89601,
+            "Z": 400.94394
+          },
+          "TerritoryId": 818,
+          "InteractionType": "WalkTo"
+        },
         {
           "Position": {
             "X": -361.26102,
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/A1-Crystarium 1/3279_The Syrcus Trench.json b/QuestPaths/5.x - Shadowbringers/MSQ/A1-Crystarium 1/3279_The Syrcus Trench.json
index 61515c17..456f753b 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/A1-Crystarium 1/3279_The Syrcus Trench.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/A1-Crystarium 1/3279_The Syrcus Trench.json	
@@ -104,7 +104,7 @@
           },
           "TerritoryId": 877,
           "InteractionType": "WalkTo",
-          "Mount": false
+          "RestartNavigationIfCancelled": false
         }
       ]
     },
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3286_City of Final Pleasures.json b/QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3286_City of Final Pleasures.json
index fecd56c3..ed00acad 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3286_City of Final Pleasures.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3286_City of Final Pleasures.json	
@@ -20,6 +20,28 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1027452,
+          "Position": {
+            "X": -310.62793,
+            "Y": 19.405178,
+            "Z": 405.2948
+          },
+          "TerritoryId": 814,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3360
+        },
+        {
+          "DataId": 1030763,
+          "Position": {
+            "X": -306.2334,
+            "Y": 20.956566,
+            "Z": 358.41907
+          },
+          "TerritoryId": 814,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3371
+        },
         {
           "DataId": 2009964,
           "Position": {
@@ -140,10 +162,11 @@
             "Y": 6,
             "Z": 33.17366
           },
-          "StopDistance": 5,
+          "StopDistance": 0.25,
           "TerritoryId": 820,
           "InteractionType": "UseItem",
-          "ItemId": 2002575
+          "ItemId": 2002575,
+          "DelaySecondsAtStart": 3
         }
       ]
     },
@@ -197,7 +220,8 @@
           },
           "TerritoryId": 820,
           "InteractionType": "Interact",
-          "TargetTerritoryId": 820
+          "TargetTerritoryId": 820,
+          "Sprint": true
         },
         {
           "DataId": 1029830,
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3288_A Taste of Honey.json b/QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3288_A Taste of Honey.json
index fa499ae3..fe86189e 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3288_A Taste of Honey.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3288_A Taste of Honey.json	
@@ -43,13 +43,22 @@
             "Z": -70.08472
           },
           "TerritoryId": 820,
-          "InteractionType": "Instruction",
-          "Comment": "Win first game",
+          "InteractionType": "Interact",
           "DialogueChoices": [
             {
               "Type": "List",
               "Prompt": "TEXT_LUCKMA207_03288_Q1_000_041",
               "Answer": "TEXT_LUCKMA207_03288_A1_000_042"
+            },
+            {
+              "Type": "List",
+              "Prompt": "TEXT_LUCKMA207_03288_Q2_000_052",
+              "Answer": "TEXT_LUCKMA207_03288_A2_000_054"
+            },
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_LUCKMA207_03288_TISTABIE_000_060",
+              "Yes": true
             }
           ]
         }
@@ -66,13 +75,22 @@
             "Z": -70.08472
           },
           "TerritoryId": 820,
-          "InteractionType": "Instruction",
-          "Comment": "Win second game",
+          "InteractionType": "Interact",
           "DialogueChoices": [
             {
               "Type": "List",
               "Prompt": "TEXT_LUCKMA207_03288_Q1_000_041",
               "Answer": "TEXT_LUCKMA207_03288_A1_000_042"
+            },
+            {
+              "Type": "List",
+              "Prompt": "TEXT_LUCKMA207_03288_Q2_000_052",
+              "Answer": "TEXT_LUCKMA207_03288_A2_000_054"
+            },
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_LUCKMA207_03288_TISTABIE_000_060",
+              "Yes": true
             }
           ]
         }
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3289_A Blessed Instrument.json b/QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3289_A Blessed Instrument.json
index bf4ae094..94f2bca1 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3289_A Blessed Instrument.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/A2-Kholusia 1/3289_A Blessed Instrument.json	
@@ -62,7 +62,7 @@
         {
           "TerritoryId": 820,
           "InteractionType": "AttuneAethernetShard",
-          "AethernetShard": "[Eulmore] Nightsoil Pots",
+          "AethernetShard": "[Eulmore] Southeast Derelicts",
           "AethernetShortcut": [
             "[Eulmore] The Mainstay",
             "[Eulmore] The Glory Gate"
@@ -83,6 +83,11 @@
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "TerritoryId": 820,
+          "InteractionType": "AttuneAethernetShard",
+          "AethernetShard": "[Eulmore] Nightsoil Pots"
+        },
         {
           "DataId": 1029838,
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/A3-Amh Araeng 1/3294_A Desert Crossing.json b/QuestPaths/5.x - Shadowbringers/MSQ/A3-Amh Araeng 1/3294_A Desert Crossing.json
index e362a1ed..ba61712a 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/A3-Amh Araeng 1/3294_A Desert Crossing.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/A3-Amh Araeng 1/3294_A Desert Crossing.json	
@@ -20,6 +20,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1027872,
+          "Position": {
+            "X": 268.4519,
+            "Y": 4.0296993,
+            "Z": -144.1825
+          },
+          "TerritoryId": 815,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3375
+        },
         {
           "DataId": 1030606,
           "Position": {
@@ -28,7 +39,8 @@
             "Z": -117.93707
           },
           "TerritoryId": 815,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Amh Araeng - Mord Souq"
         }
       ]
     },
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/A3-Amh Araeng 1/3297_A Purchase of Fruit.json b/QuestPaths/5.x - Shadowbringers/MSQ/A3-Amh Araeng 1/3297_A Purchase of Fruit.json
index f872b922..53c877c9 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/A3-Amh Araeng 1/3297_A Purchase of Fruit.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/A3-Amh Araeng 1/3297_A Purchase of Fruit.json	
@@ -51,6 +51,15 @@
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "Position": {
+            "X": 362.283,
+            "Y": -27.966003,
+            "Z": 304.85144
+          },
+          "TerritoryId": 815,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 1030386,
           "Position": {
@@ -58,6 +67,7 @@
             "Y": -27.966003,
             "Z": 301.2893
           },
+          "StopDistance": 5,
           "TerritoryId": 815,
           "InteractionType": "Interact"
         }
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/A4-Crystarium 2/3300_The Lightwardens.json b/QuestPaths/5.x - Shadowbringers/MSQ/A4-Crystarium 2/3300_The Lightwardens.json
index 2ad4c858..e889192d 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/A4-Crystarium 2/3300_The Lightwardens.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/A4-Crystarium 2/3300_The Lightwardens.json	
@@ -85,6 +85,15 @@
           "InteractionType": "AttuneAetheryte",
           "Aetheryte": "Lakeland - Fort Jobb"
         },
+        {
+          "Position": {
+            "X": 601.42426,
+            "Y": 23.210327,
+            "Z": -223.36815
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 2010028,
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3302_An Unwelcome Guest.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3302_An Unwelcome Guest.json
index b5a421bd..6c053aeb 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3302_An Unwelcome Guest.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3302_An Unwelcome Guest.json	
@@ -12,7 +12,6 @@
             "Y": 1.7160122,
             "Z": 249.83594
           },
-          "StopDistance": 7,
           "TerritoryId": 819,
           "InteractionType": "AcceptQuest"
         }
@@ -21,6 +20,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1027948,
+          "Position": {
+            "X": 40.42102,
+            "Y": 2.232896,
+            "Z": 261.49377
+          },
+          "TerritoryId": 819,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3380
+        },
         {
           "DataId": 1027230,
           "Position": {
@@ -30,11 +40,17 @@
           },
           "TerritoryId": 819,
           "InteractionType": "Interact",
+          "AetheryaateShortcut": "Crystarium",
           "AethernetShortcut": [
             "[Crystarium] The Pendants",
             "[Crystarium] The Dossal Gate"
           ],
-          "TargetTerritoryId": 844
+          "TargetTerritoryId": 844,
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3305_The Oracle of Light.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3305_The Oracle of Light.json
index 5aeffbc0..317653d7 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3305_The Oracle of Light.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3305_The Oracle of Light.json	
@@ -165,6 +165,39 @@
     {
       "Sequence": 4,
       "Steps": [
+        {
+          "DataId": 1031212,
+          "Position": {
+            "X": -673.0907,
+            "Y": 51.157936,
+            "Z": -219.50104
+          },
+          "TerritoryId": 813,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3385
+        },
+        {
+          "DataId": 1027382,
+          "Position": {
+            "X": -765.92664,
+            "Y": 61.720478,
+            "Z": -304.1886
+          },
+          "TerritoryId": 813,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3384
+        },
+        {
+          "DataId": 1027419,
+          "Position": {
+            "X": -700.7401,
+            "Y": 61.993748,
+            "Z": -353.62787
+          },
+          "TerritoryId": 813,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3386
+        },
         {
           "Position": {
             "X": -724.9727,
@@ -178,7 +211,8 @@
               "Flying": "Unlocked"
             }
           },
-          "Comment": "Tower Bottom"
+          "Comment": "Tower Bottom",
+          "AetheryteShortcut": "Lakeland - Ostall Imperative"
         },
         {
           "Position": {
@@ -347,7 +381,8 @@
             "StepIf": {
               "Flying": "Locked"
             }
-          }
+          },
+          "Fly": true
         },
         {
           "DataId": 1028955,
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3307_Sul Uin's Request.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3307_Sul Uin's Request.json
index b4801eed..9c45180c 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3307_Sul Uin's Request.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3307_Sul Uin's Request.json	
@@ -20,6 +20,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1030266,
+          "Position": {
+            "X": -367.66614,
+            "Y": 66.863594,
+            "Z": 557.1526
+          },
+          "TerritoryId": 816,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3395
+        },
         {
           "Position": {
             "X": -359.70227,
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3311_Courting Cooperation.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3311_Courting Cooperation.json
index 1e71b76d..dc7d4c4f 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3311_Courting Cooperation.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3311_Courting Cooperation.json	
@@ -28,6 +28,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1030618,
+          "Position": {
+            "X": -613.39746,
+            "Y": 36.54754,
+            "Z": -215.41168
+          },
+          "TerritoryId": 816,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3398
+        },
         {
           "Position": {
             "X": -629.64935,
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3312_The Key to the Castle.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3312_The Key to the Castle.json
index dacfa4d5..226f762c 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3312_The Key to the Castle.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3312_The Key to the Castle.json	
@@ -23,6 +23,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1030838,
+          "Position": {
+            "X": -285.90833,
+            "Y": 40.324036,
+            "Z": 444.41882
+          },
+          "TerritoryId": 816,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3404
+        },
         {
           "DataId": 2009828,
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3315_Spore Sweeper.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3315_Spore Sweeper.json
index 99929255..56ceb583 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3315_Spore Sweeper.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3315_Spore Sweeper.json	
@@ -106,7 +106,9 @@
             "Z": -860.6854
           },
           "TerritoryId": 816,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true,
+          "Mount": true
         },
         {
           "DataId": 2009832,
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3319_Memento of a Friend.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3319_Memento of a Friend.json
index 8e86fac8..7d94ca84 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3319_Memento of a Friend.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3319_Memento of a Friend.json	
@@ -21,6 +21,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1027695,
+          "Position": {
+            "X": 441.64185,
+            "Y": 89.80711,
+            "Z": -653.43713
+          },
+          "TerritoryId": 816,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3427
+        },
         {
           "Position": {
             "X": 57.868374,
@@ -28,8 +39,7 @@
             "Z": -431.17603
           },
           "TerritoryId": 816,
-          "InteractionType": "Dive",
-          "Comment": "TODO: Verify diving works here"
+          "InteractionType": "Dive"
         },
         {
           "DataId": 2009837,
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3323_A Little Faith.json b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3323_A Little Faith.json
index c33dfe69..a5286f4e 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3323_A Little Faith.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3323_A Little Faith.json	
@@ -40,6 +40,21 @@
             }
           }
         },
+        {
+          "Position": {
+            "X": 731.32855,
+            "Y": 13.078317,
+            "Z": -147.50694
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
         {
           "Position": {
             "X": 731.32855,
@@ -49,7 +64,11 @@
           "TerritoryId": 813,
           "InteractionType": "WalkTo",
           "Fly": true,
-          "DisableNavmesh": true
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Locked"
+            }
+          }
         },
         {
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3327_Lost but Not Forgotten.json b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3327_Lost but Not Forgotten.json
index 0fb8e7cb..3b4713ba 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3327_Lost but Not Forgotten.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3327_Lost but Not Forgotten.json	
@@ -20,6 +20,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1029023,
+          "Position": {
+            "X": -131.36493,
+            "Y": -16.477911,
+            "Z": 316.3042
+          },
+          "TerritoryId": 817,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3444
+        },
         {
           "DataId": 2009866,
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3329_Stirring Up Trouble.json b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3329_Stirring Up Trouble.json
index 4682c425..32618958 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3329_Stirring Up Trouble.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3329_Stirring Up Trouble.json	
@@ -36,6 +36,15 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "Position": {
+            "X": -138.85619,
+            "Y": -3.036951,
+            "Z": 54.482983
+          },
+          "TerritoryId": 817,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 2010066,
           "Position": {
@@ -45,7 +54,8 @@
           },
           "TerritoryId": 817,
           "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818285
+          "AetherCurrentId": 2818285,
+          "DisableNavmesh": true
         },
         {
           "DataId": 1029214,
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3332_Put to the Proof.json b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3332_Put to the Proof.json
index d586e2ea..52339cbf 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3332_Put to the Proof.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3332_Put to the Proof.json	
@@ -21,6 +21,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1030747,
+          "Position": {
+            "X": -81.28485,
+            "Y": -19.061882,
+            "Z": 307.20984
+          },
+          "TerritoryId": 817,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3656
+        },
         {
           "DataId": 1029223,
           "Position": {
@@ -149,7 +160,8 @@
           "TerritoryId": 817,
           "InteractionType": "WalkTo",
           "Fly": true,
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "Mount": true
         },
         {
           "Position": {
@@ -169,7 +181,8 @@
           },
           "TerritoryId": 817,
           "InteractionType": "WalkTo",
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "RestartNavigationIfCancelled": false
         },
         {
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3333_Into the Wood.json b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3333_Into the Wood.json
index e94f1f50..0caad6c3 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3333_Into the Wood.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3333_Into the Wood.json	
@@ -44,7 +44,8 @@
           },
           "TerritoryId": 817,
           "InteractionType": "WalkTo",
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "Mount": true
         },
         {
           "Position": {
@@ -93,6 +94,15 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "Position": {
+            "X": 434.4612,
+            "Y": 4.434532,
+            "Z": -7.1864815
+          },
+          "TerritoryId": 817,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 1029228,
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3335_Look to the Stars.json b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3335_Look to the Stars.json
index 668c8fee..2272c5ee 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3335_Look to the Stars.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3335_Look to the Stars.json	
@@ -20,6 +20,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1027736,
+          "Position": {
+            "X": 396.38354,
+            "Y": 20.422523,
+            "Z": -179.12573
+          },
+          "TerritoryId": 817,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3467
+        },
         {
           "DataId": 1029238,
           "Position": {
@@ -197,7 +208,6 @@
           "TerritoryId": 817,
           "InteractionType": "Jump",
           "Comment": "Northwest",
-          "DisableNavmesh": true,
           "JumpDestination": {
             "Position": {
               "X": 123.35363,
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3340_The Burden of Knowledge.json b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3340_The Burden of Knowledge.json
index b90541c6..63ebecdc 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3340_The Burden of Knowledge.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3340_The Burden of Knowledge.json	
@@ -24,6 +24,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1027716,
+          "Position": {
+            "X": 494.9873,
+            "Y": -6.555339,
+            "Z": -224.93329
+          },
+          "TerritoryId": 817,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3478
+        },
         {
           "DataId": 2010073,
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3607_Word from On High.json b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3607_Word from On High.json
index fabaa0fb..ab8dcdc0 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3607_Word from On High.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3607_Word from On High.json	
@@ -81,6 +81,16 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "Position": {
+            "X": -694.03015,
+            "Y": 52.60457,
+            "Z": -139.54802
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "Mount": true
+        },
         {
           "DataId": 1029606,
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3614_Down for Maintenance.json b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3614_Down for Maintenance.json
index 6fddc0c2..610aec80 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3614_Down for Maintenance.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3614_Down for Maintenance.json	
@@ -51,8 +51,7 @@
               "RewardItemId": 2002560,
               "RewardItemCount": 3
             }
-          ],
-          "Comment": "Probably needs manual movement (or waiting for enemies to respawn)"
+          ]
         }
       ]
     },
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3616_A Convenient Distraction.json b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3616_A Convenient Distraction.json
index 66b6fd40..d3b3b7fe 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3616_A Convenient Distraction.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3616_A Convenient Distraction.json	
@@ -20,6 +20,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1027927,
+          "Position": {
+            "X": -476.95123,
+            "Y": 47.78906,
+            "Z": -200.61041
+          },
+          "TerritoryId": 815,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3511
+        },
         {
           "DataId": 1029756,
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3619_Full Steam Ahead.json b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3619_Full Steam Ahead.json
index b578ea08..4a39fbd5 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3619_Full Steam Ahead.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3619_Full Steam Ahead.json	
@@ -23,6 +23,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1030419,
+          "Position": {
+            "X": -506.6148,
+            "Y": 45.614502,
+            "Z": -194.50684
+          },
+          "TerritoryId": 815,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3525
+        },
         {
           "DataId": 1029768,
           "Position": {
@@ -31,7 +42,8 @@
             "Z": -583.7339
           },
           "TerritoryId": 815,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Amh Araeng - Twine"
         }
       ]
     },
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3622_More than a Hunch.json b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3622_More than a Hunch.json
index 0b92b58a..8dea3028 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3622_More than a Hunch.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3622_More than a Hunch.json	
@@ -54,6 +54,13 @@
           "AethernetShortcut": [
             "[Crystarium] The Dossal Gate",
             "[Crystarium] The Pendants"
+          ],
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_LUCKMD117_03622_Q2_000_000",
+              "Yes": true
+            }
           ]
         }
       ]
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3632_Paradise Fallen.json b/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3632_Paradise Fallen.json
index f8f5d851..dbc109f6 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3632_Paradise Fallen.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3632_Paradise Fallen.json	
@@ -61,12 +61,6 @@
     {
       "Sequence": 3,
       "Steps": [
-        {
-          "TerritoryId": 820,
-          "InteractionType": "AttuneAethernetShard",
-          "AethernetShard": "[Eulmore] Southeast Derelicts",
-          "Comment": "TODO This step isn't very a good place to have this attunement; the next step should use Nightsoil Pots"
-        },
         {
           "DataId": 1030191,
           "Position": {
@@ -77,7 +71,7 @@
           "TerritoryId": 820,
           "InteractionType": "Interact",
           "AethernetShortcut": [
-            "[Eulmore] Southeast Derelicts",
+            "[Eulmore] Nightsoil Pots",
             "[Eulmore] The Mainstay"
           ]
         }
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3640_Rich Veins of Hope.json b/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3640_Rich Veins of Hope.json
index fcb82d63..04f918d9 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3640_Rich Veins of Hope.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3640_Rich Veins of Hope.json	
@@ -36,6 +36,25 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "DataId": 1030776,
+          "Position": {
+            "X": -450.85834,
+            "Y": 417.1344,
+            "Z": -610.8644
+          },
+          "TerritoryId": 814,
+          "InteractionType": "AcceptQuest",
+          "DialogueChoices": [
+            {
+              "ExcelSheet": "quest/035/LucKzi101_03556",
+              "Type": "List",
+              "Prompt": "TEXT_LUCKZI101_03556_Q1_000_000",
+              "Answer": "TEXT_LUCKZI101_03556_A1_000_001"
+            }
+          ],
+          "PickUpQuestId": 3556
+        },
         {
           "DataId": 1030292,
           "Position": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3642_A Breath of Respite.json b/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3642_A Breath of Respite.json
index 8d687cb0..a1e3334c 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3642_A Breath of Respite.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3642_A Breath of Respite.json	
@@ -36,6 +36,18 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "DataId": 1027956,
+          "Position": {
+            "X": -128.77094,
+            "Y": 354.35815,
+            "Z": -179.18677
+          },
+          "StopDistance": 5,
+          "TerritoryId": 814,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3537
+        },
         {
           "Position": {
             "X": -122.537926,
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3643_Extinguishing the Last Light.json b/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3643_Extinguishing the Last Light.json
index 5c025ad6..67b106f2 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3643_Extinguishing the Last Light.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3643_Extinguishing the Last Light.json	
@@ -55,7 +55,8 @@
             "Z": -797.3602
           },
           "TerritoryId": 814,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Kholusia - Tomra"
         }
       ]
     },
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3645_In His Garden.json b/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3645_In His Garden.json
index a2485ea1..ece82b0f 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3645_In His Garden.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3645_In His Garden.json	
@@ -129,6 +129,14 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "TerritoryId": 819,
+          "InteractionType": "None",
+          "AethernetShortcut": [
+            "[Crystarium] The Amaro Launch",
+            "[Crystarium] Tessellation (Lakeland)"
+          ]
+        },
         {
           "Position": {
             "X": 608.7031,
@@ -137,10 +145,6 @@
           },
           "TerritoryId": 813,
           "InteractionType": "WalkTo",
-          "AethernetShortcut": [
-            "[Crystarium] The Amaro Launch",
-            "[Crystarium] Tessellation (Lakeland)"
-          ],
           "Fly": true,
           "SkipConditions": {
             "StepIf": {
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3647_To Storm-tossed Seas.json b/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3647_To Storm-tossed Seas.json
index 86cc8daa..74e45874 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3647_To Storm-tossed Seas.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3647_To Storm-tossed Seas.json	
@@ -21,6 +21,14 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "TerritoryId": 819,
+          "AethernetShortcut": [
+            "[Crystarium] The Amaro Launch",
+            "[Crystarium] Tessellation (Lakeland)"
+          ],
+          "InteractionType": "None"
+        },
         {
           "Position": {
             "X": 55.589294,
@@ -29,10 +37,6 @@
           },
           "TerritoryId": 813,
           "InteractionType": "WalkTo",
-          "AethernetShortcut": [
-            "[Crystarium] The Amaro Launch",
-            "[Crystarium] Tessellation (Lakeland)"
-          ],
           "SkipConditions": {
             "StepIf": {
               "Flying": "Unlocked"
@@ -85,7 +89,6 @@
     },
     {
       "Sequence": 2,
-      "Comment": "TODO Verify when flying unlocked",
       "Steps": [
         {
           "Position": {
@@ -148,7 +151,6 @@
     },
     {
       "Sequence": 3,
-      "Comment": "TODO Verify when flying unlocked",
       "Steps": [
         {
           "Position": {
@@ -158,7 +160,8 @@
           },
           "TerritoryId": 813,
           "InteractionType": "WalkTo",
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "Mount": true
         },
         {
           "Position": {
@@ -167,7 +170,12 @@
             "Z": 810.7269
           },
           "TerritoryId": 813,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
         },
         {
           "Position": {
@@ -177,7 +185,12 @@
           },
           "TerritoryId": 813,
           "InteractionType": "WalkTo",
-          "Mount": true
+          "Mount": true,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
         },
         {
           "DataId": 1030333,
@@ -188,6 +201,7 @@
           },
           "TerritoryId": 813,
           "InteractionType": "Interact",
+          "Fly": true,
           "DialogueChoices": [
             {
               "Type": "List",
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3649_City of the Ancients.json b/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3649_City of the Ancients.json
index 97c8984c..34fa28fc 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3649_City of the Ancients.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3649_City of the Ancients.json	
@@ -20,6 +20,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1031015,
+          "Position": {
+            "X": 530.51025,
+            "Y": 353.54364,
+            "Z": -244.00702
+          },
+          "TerritoryId": 818,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3588
+        },
         {
           "DataId": 1030518,
           "Position": {
@@ -54,6 +65,15 @@
             128
           ]
         },
+        {
+          "Position": {
+            "X": 324.9114,
+            "Y": 353.76694,
+            "Z": -475.44562
+          },
+          "TerritoryId": 818,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 2010142,
           "Position": {
@@ -61,9 +81,18 @@
             "Y": 355.79456,
             "Z": -477.53113
           },
+          "StopDistance": 4,
           "TerritoryId": 818,
           "InteractionType": "UseItem",
-          "ItemId": 2002673
+          "ItemId": 2002673,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         }
       ]
     },
diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3653_A Greater Purpose.json b/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3653_A Greater Purpose.json
index 42fd0d82..bae69a79 100644
--- a/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3653_A Greater Purpose.json	
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3653_A Greater Purpose.json	
@@ -20,6 +20,39 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1027778,
+          "Position": {
+            "X": -713.28296,
+            "Y": -245.368,
+            "Z": 498.49683
+          },
+          "TerritoryId": 818,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3593
+        },
+        {
+          "DataId": 1030477,
+          "Position": {
+            "X": -594.6593,
+            "Y": -266.7698,
+            "Z": 338.70447
+          },
+          "TerritoryId": 818,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3594
+        },
+        {
+          "DataId": 1027775,
+          "Position": {
+            "X": -390.85986,
+            "Y": -260.17664,
+            "Z": 308.46106
+          },
+          "TerritoryId": 818,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 3592
+        },
         {
           "TerritoryId": 818,
           "InteractionType": "AttuneAetheryte",
@@ -162,7 +195,8 @@
             "Z": 444.7069
           },
           "TerritoryId": 818,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Tempest - Macarenses Angle"
         },
         {
           "DataId": 1030558,