diff --git a/af/investigatethefactions.af b/af/investigatethefactions.af
index cdd202c..ea8b370 100644
--- a/af/investigatethefactions.af
+++ b/af/investigatethefactions.af
@@ -20,57 +20,28 @@ STATE: {Default}
 		DO: SetState {GoToJondor}
 
 ~~ Step 1: Travel to Zaikhal and talk to Jondor Torgren
+~~ ChatMatch fires in the same state while the tlk nav node triggers the dialog
 STATE: {GoToJondor}
 	IF: Death
 		DO: SetState {Death}
-	IF: All
-			NavEmpty
-			Expr {testvar[jondorNavLoaded]}
-		DO: SetState {WaitJondor}
+	IF: ChatMatch {^Jondor Torgren tells you,}
+		DO: SetState {GoToJawaq}
 	IF: Always
 		DO: DoAll
 				EmbedNav nav_jondortorgren {Travel to Jondor Torgren}
-				DoExpr {touchvar[jondorNavLoaded]}
 				SetWatchdog 10.0 300.0 {Stuck}
 
-STATE: {WaitJondor}
-	IF: Death
-		DO: SetState {Death}
-	IF: ChatMatch {^Jondor Torgren tells you,}
-		DO: DoAll
-				DoExpr {clearvar[jondorNavLoaded]}
-				SetState {GoToJawaq}
-	IF: SecsInStateGE 30
-		DO: DoAll
-				DoExpr {clearvar[jondorNavLoaded]}
-				SetState {GoToJawaq}
-
 ~~ Step 2: Travel to Jawaq ibn Janath and talk to him
 STATE: {GoToJawaq}
 	IF: Death
 		DO: SetState {Death}
-	IF: All
-			NavEmpty
-			Expr {testvar[jawaqNavLoaded]}
-		DO: SetState {WaitJawaq}
+	IF: ChatMatch {^Jawaq ibn Janath tells you,}
+		DO: SetState {GoToLictorPit}
 	IF: Always
 		DO: DoAll
 				EmbedNav nav_jawaqibnjanath {Travel to Jawaq ibn Janath}
-				DoExpr {touchvar[jawaqNavLoaded]}
 				SetWatchdog 10.0 300.0 {Stuck}
 
-STATE: {WaitJawaq}
-	IF: Death
-		DO: SetState {Death}
-	IF: ChatMatch {^Jawaq ibn Janath tells you,}
-		DO: DoAll
-				DoExpr {clearvar[jawaqNavLoaded]}
-				SetState {GoToLictorPit}
-	IF: SecsInStateGE 30
-		DO: DoAll
-				DoExpr {clearvar[jawaqNavLoaded]}
-				SetState {GoToLictorPit}
-
 ~~ Step 3: Move to the Blight Revenant Pit and kill Blight Lictor
 STATE: {GoToLictorPit}
 	IF: Death
@@ -98,32 +69,18 @@ STATE: {HuntLictor}
 				SetWatchdog 10.0 600.0 {Stuck}
 
 ~~ Step 4: Return to Jawaq and give him the head
-~~ nav_givehead nav walks back to Jawaq and issues /ub give via cht node
+~~ nav_givehead walks back to Jawaq and issues /ub give via cht node
+~~ Advance when letter appears in inventory
 STATE: {GiveHead}
 	IF: Death
 		DO: SetState {Death}
-	IF: All
-			NavEmpty
-			Expr {testvar[giveHeadNavLoaded]}
-		DO: SetState {WaitLetter}
+	IF: ItemCountGE 1 {Radiant Blood Letter of Introduction}
+		DO: SetState {GoToVierana}
 	IF: Always
 		DO: DoAll
 				EmbedNav nav_givehead {Return to Jawaq, give Blight Lictor's Head}
-				DoExpr {touchvar[giveHeadNavLoaded]}
 				SetWatchdog 10.0 300.0 {Stuck}
 
-STATE: {WaitLetter}
-	IF: Death
-		DO: SetState {Death}
-	IF: ItemCountGE 1 {Radiant Blood Letter of Introduction}
-		DO: DoAll
-				DoExpr {clearvar[giveHeadNavLoaded]}
-				SetState {GoToVierana}
-	IF: SecsInStateGE 30
-		DO: DoAll
-				DoExpr {clearvar[giveHeadNavLoaded]}
-				SetState {GiveHead}
-
 ~~ Step 5: Travel to Ayan Baqur and give letter to Vierana du Canamorra
 ~~ nav_vieranaducanamorra walks to Vierana and issues /ub give via cht node
 STATE: {GoToVierana}
diff --git a/met/investigatethefactions.met b/met/investigatethefactions.met
index db1d432..ed7b382 100644
--- a/met/investigatethefactions.met
+++ b/met/investigatethefactions.met
@@ -11,7 +11,7 @@ n
 n
 n
 n
-32
+23
 i
 8
 i
@@ -43,35 +43,13 @@ Death
 s
 GoToJondor
 i
-2
+4
 i
 1
-TABLE
-2
-K
-V
-n
-n
-2
-i
-7
-i
-0
-i
-26
-TABLE
-2
-k
-v
-n
-n
-1
 s
-e
+^Jondor Torgren tells you,
 s
-testvar[jondorNavLoaded]
-s
-WaitJondor
+GoToJawaq
 s
 GoToJondor
 i
@@ -86,7 +64,7 @@ K
 V
 n
 n
-3
+2
 i
 4
 ba
@@ -227,19 +205,6 @@ True
 13.6436941782633
 0.516687512397766
 i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-touchvar[jondorNavLoaded]
-i
 9
 TABLE
 2
@@ -271,111 +236,15 @@ i
 s
 Death
 s
-WaitJondor
+GoToJawaq
 i
 4
 i
-3
-s
-^Jondor Torgren tells you,
-TABLE
-2
-K
-V
-n
-n
-2
-i
-7
-TABLE
-2
-k
-v
-n
-n
 1
 s
-e
+^Jawaq ibn Janath tells you,
 s
-clearvar[jondorNavLoaded]
-i
-1
-s
-GoToJawaq
-s
-WaitJondor
-i
-6
-i
-3
-i
-30
-TABLE
-2
-K
-V
-n
-n
-2
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-clearvar[jondorNavLoaded]
-i
-1
-s
-GoToJawaq
-s
-WaitJondor
-i
-8
-i
-1
-i
-0
-s
-Death
-s
-GoToJawaq
-i
-2
-i
-1
-TABLE
-2
-K
-V
-n
-n
-2
-i
-7
-i
-0
-i
-26
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-testvar[jawaqNavLoaded]
-s
-WaitJawaq
+GoToLictorPit
 s
 GoToJawaq
 i
@@ -390,7 +259,7 @@ K
 V
 n
 n
-3
+2
 i
 4
 ba
@@ -904,19 +773,6 @@ True
 -65.2727708180745
 0.0333541706204414
 i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-touchvar[jawaqNavLoaded]
-i
 9
 TABLE
 2
@@ -948,80 +804,6 @@ i
 s
 Death
 s
-WaitJawaq
-i
-4
-i
-3
-s
-^Jawaq ibn Janath tells you,
-TABLE
-2
-K
-V
-n
-n
-2
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-clearvar[jawaqNavLoaded]
-i
-1
-s
-GoToLictorPit
-s
-WaitJawaq
-i
-6
-i
-3
-i
-30
-TABLE
-2
-K
-V
-n
-n
-2
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-clearvar[jawaqNavLoaded]
-i
-1
-s
-GoToLictorPit
-s
-WaitJawaq
-i
-8
-i
-1
-i
-0
-s
-Death
-s
 GoToLictorPit
 i
 2
@@ -1294,35 +1076,26 @@ Death
 s
 GiveHead
 i
-2
+12
 i
 1
 TABLE
 2
-K
-V
-n
-n
-2
-i
-7
-i
-0
-i
-26
-TABLE
-2
 k
 v
 n
 n
+2
+s
+n
+s
+Radiant Blood Letter of Introduction
+s
+c
+i
 1
 s
-e
-s
-testvar[giveHeadNavLoaded]
-s
-WaitLetter
+GoToVierana
 s
 GiveHead
 i
@@ -1337,7 +1110,7 @@ K
 V
 n
 n
-3
+2
 i
 4
 ba
@@ -1401,19 +1174,6 @@ uTank2 NAV 1.2
 0
 2000
 i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-touchvar[giveHeadNavLoaded]
-i
 9
 TABLE
 2
@@ -1445,93 +1205,6 @@ i
 s
 Death
 s
-WaitLetter
-i
-12
-i
-3
-TABLE
-2
-k
-v
-n
-n
-2
-s
-n
-s
-Radiant Blood Letter of Introduction
-s
-c
-i
-1
-TABLE
-2
-K
-V
-n
-n
-2
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-clearvar[giveHeadNavLoaded]
-i
-1
-s
-GoToVierana
-s
-WaitLetter
-i
-6
-i
-3
-i
-30
-TABLE
-2
-K
-V
-n
-n
-2
-i
-7
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-clearvar[giveHeadNavLoaded]
-i
-1
-s
-GiveHead
-s
-WaitLetter
-i
-8
-i
-1
-i
-0
-s
-Death
-s
 GoToVierana
 i
 2