diff --git a/aphus.af b/aphus.af
index 9d834c9..6b7dc35 100644
--- a/aphus.af
+++ b/aphus.af
@@ -82,20 +82,15 @@ STATE: {Default} ~~ {
 STATE: {goingback} ~~ {
 	IF:	SecsInStateGE 900
 		DO:	SetState {goingback}
-	IF:	Always
-		DO:	Chat {/vt opt set enablenav true}
 	IF:	Death
 		DO:	SetState {death}
 	IF:	Always
-		DO:	Chat {/vt opt set enablebuffing true}
-	IF:	Always
-		DO:	Chat {/vt opt set enablecombat false}
-	IF:	Always
-		DO:	Chat {/vt nav load aphus_route+getvar[navNumber]}
-	IF:	NavEmpty
-		DO:	DoAll				
-				ChatExpr {\/vt nav load aphus_circuit+getvar[navNumber]}
-				SetState {tusker_run}
+		DO:	DoAll
+				Chat {/vt opt set enablenav true}
+				Chat {/vt opt set enablebuffing true}
+				Chat {/vt opt set enablecombat false}
+				Chat {/vt nav load aphus_route+getvar[navNumber]}
+				SetState {tusker_run}		
 ~~ }
 STATE: {hunt} ~~ {
 	IF:	Always
@@ -159,10 +154,12 @@ STATE: {out_of_comp} ~~ {
 		DO:	SetState {goingback}
 ~~ }
 STATE: {tusker_run} ~~ {
+	IF:	SecsInStateGE 900
+		DO:	SetState {goingback}
 	IF:	Death
 		DO:	SetState {death}
 	IF:	NavEmpty
-		DO:	DoAll
-				SetState {hunt}
+		DO:	DoAll				
 				ChatExpr {\/vt nav load aphus_circuit+getvar[navNumber]}
+				SetState {hunt}
 ~~ }
diff --git a/aphus.met b/aphus.met
index b9e5e5b..0a47072 100644
--- a/aphus.met
+++ b/aphus.met
@@ -11,7 +11,7 @@ n
 n
 n
 n
-31
+28
 i
 16
 i
@@ -235,16 +235,6 @@ goingback
 s
 goingback
 i
-1
-i
-2
-i
-0
-s
-/vt opt set enablenav true
-s
-goingback
-i
 8
 i
 1
@@ -257,36 +247,6 @@ goingback
 i
 1
 i
-2
-i
-0
-s
-/vt opt set enablebuffing true
-s
-goingback
-i
-1
-i
-2
-i
-0
-s
-/vt opt set enablecombat false
-s
-goingback
-i
-1
-i
-2
-i
-0
-s
-/vt nav load aphus_route+getvar[navNumber]
-s
-goingback
-i
-7
-i
 3
 i
 0
@@ -296,20 +256,23 @@ K
 V
 n
 n
-2
+5
 i
-8
-TABLE
 2
-k
-v
-n
-n
-1
 s
-e
+/vt opt set enablenav true
+i
+2
 s
-\/vt nav load aphus_circuit+getvar[navNumber]
+/vt opt set enablebuffing true
+i
+2
+s
+/vt opt set enablecombat false
+i
+2
+s
+/vt nav load aphus_route+getvar[navNumber]
 i
 1
 s
@@ -702,6 +665,16 @@ goingback
 s
 out_of_comp
 i
+6
+i
+1
+i
+900
+s
+goingback
+s
+tusker_run
+i
 8
 i
 1
@@ -725,10 +698,6 @@ n
 n
 2
 i
-1
-s
-hunt
-i
 8
 TABLE
 2
@@ -741,5 +710,9 @@ s
 e
 s
 \/vt nav load aphus_circuit+getvar[navNumber]
+i
+1
+s
+hunt
 s
 tusker_run