diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/376_You Shall Not Trespass.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/376_You Shall Not Trespass.json
index c8f8f3e..e8d23ed 100644
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/376_You Shall Not Trespass.json	
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/376_You Shall Not Trespass.json	
@@ -61,10 +61,21 @@
           "TerritoryId": 148,
           "InteractionType": "Combat",
           "EnemySpawnType": "OverworldEnemies",
-          "KillEnemyDataIds": [
-            771
-          ],
-          "Comment": "Kill Qiqirn manually"
+          "ComplexCombatData": [
+            {
+              "DataId": 771,
+              "CompletionQuestVariablesFlags": [
+                {
+                  "Low": 4
+                },
+                null,
+                null,
+                null,
+                null,
+                null
+              ]
+            }
+          ]
         }
       ]
     },
diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/3855_A Soldier's Breakfast.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/3855_A Soldier's Breakfast.json
index 51cad9c..64af3a3 100644
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/3855_A Soldier's Breakfast.json	
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/3855_A Soldier's Breakfast.json	
@@ -19,7 +19,6 @@
     },
     {
       "Sequence": 1,
-      "Comment": "TODO Figure out quest flags if picking up egg first OR doing the combat first",
       "Steps": [
         {
           "DataId": 2000010,
@@ -29,7 +28,15 @@
             "Z": -49.729187
           },
           "TerritoryId": 148,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "Position": {
@@ -43,7 +50,17 @@
           "KillEnemyDataIds": [
             142
           ],
-          "Comment": "Depending on how many enemies you fought on the way to the egg, this step could be optional"
+          "Comment": "Depending on how many enemies you fought on the way to the egg, this step could be optional",
+          "CompletionQuestVariablesFlags": [
+            null,
+            {
+              "High": 3
+            },
+            null,
+            null,
+            null,
+            null
+          ]
         }
       ]
     },
diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/387_Salvaging the Scene.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/387_Salvaging the Scene.json
index e796eaa..10579e1 100644
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/387_Salvaging the Scene.json	
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/387_Salvaging the Scene.json	
@@ -1,76 +1,92 @@
 {
-    "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
-    "Author": "liza",
-    "QuestSequence": [
-      {
-        "Sequence": 0,
-        "Steps": [
-          {
-            "DataId": 1000503,
-            "Position": {
-              "X": 178.33215,
-              "Y": -32.015224,
-              "Z": 333.30273
-            },
-            "TerritoryId": 148,
-            "InteractionType": "AcceptQuest"
-          }
-        ]
-      },
-      {
-        "Sequence": 1,
-        "Steps": [
-          {
-            "DataId": 2001018,
-            "Position": {
-              "X": 155.47412,
-              "Y": -23.66681,
-              "Z": 490.74524
-            },
-            "TerritoryId": 148,
-            "InteractionType": "Combat",
-            "EnemySpawnType": "AutoOnEnterArea",
-            "KillEnemyDataIds": [
-              26
-            ]
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1000503,
+          "Position": {
+            "X": 178.33215,
+            "Y": -32.015224,
+            "Z": 333.30273
           },
-          {
-            "DataId": 2001016,
-            "Position": {
-              "X": 152.60547,
-              "Y": -23.758362,
-              "Z": 494.71265
-            },
-            "TerritoryId": 148,
-            "InteractionType": "Interact"
+          "TerritoryId": 148,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2001018,
+          "Position": {
+            "X": 155.47412,
+            "Y": -23.66681,
+            "Z": 490.74524
           },
-          {
-              "DataId": 2001018,
-              "Position": {
-                  "X": 155.47412,
-                  "Y": -23.66681,
-                  "Z": 490.74524
-              },
-              "TerritoryId": 148,
-              "InteractionType": "Interact"
-          }
-        ]
-      },
-      {
-        "Sequence": 255,
-        "Steps": [
-          {
-            "DataId": 1000470,
-            "Position": {
-              "X": -59.006653,
-              "Y": -0.010835781,
-              "Z": 26.41333
-            },
-            "TerritoryId": 148,
-            "InteractionType": "CompleteQuest",
-            "AetheryteShortcut": "Central Shroud - Bentbranch Meadows"
-          }
-        ]
-      }
-    ]
-  }
\ No newline at end of file
+          "TerritoryId": 148,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "KillEnemyDataIds": [
+            26
+          ]
+        },
+        {
+          "DataId": 2001016,
+          "Position": {
+            "X": 152.60547,
+            "Y": -23.758362,
+            "Z": 494.71265
+          },
+          "TerritoryId": 148,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        },
+        {
+          "DataId": 2001018,
+          "Position": {
+            "X": 155.47412,
+            "Y": -23.66681,
+            "Z": 490.74524
+          },
+          "TerritoryId": 148,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1000470,
+          "Position": {
+            "X": -59.006653,
+            "Y": -0.010835781,
+            "Z": 26.41333
+          },
+          "TerritoryId": 148,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Central Shroud - Bentbranch Meadows"
+        }
+      ]
+    }
+  ]
+}