diff --git a/aphus.af b/aphus.af
index 6b7dc35..5b715e8 100644
--- a/aphus.af
+++ b/aphus.af
@@ -53,7 +53,7 @@ STATE: {death} ~~ {
 				Chat {/vt opt set enablecombat false}
 				Chat {/a ARGH I died!}
 	IF:	ExitPortal
-		DO:	SetState {goingback}
+		DO:	SetState {tusker_run}
 ~~ }
 STATE: {Default} ~~ {
 	IF:	Always
@@ -76,21 +76,6 @@ STATE: {Default} ~~ {
 				DoExpr {setvar[lootclock,stopwatchcreate[]]}
 				DoExpr {stopwatchstart[getvar[lootclock]]}
 				SetState {hunt}
-	IF:	Death
-		DO:	SetState {death}
-~~ }
-STATE: {goingback} ~~ {
-	IF:	SecsInStateGE 900
-		DO:	SetState {goingback}
-	IF:	Death
-		DO:	SetState {death}
-	IF:	Always
-		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
@@ -105,18 +90,16 @@ STATE: {hunt} ~~ {
 				Chat {/vt opt set enablenav false}
 				SetState {combat}
 	IF:	Always
-		DO:	SetWatchdog 10 600 {goingback}
+		DO:	SetWatchdog 10 600 {tusker_run}
 	IF:	ItemCountLE 100 {Prismatic Taper}
 		DO:	DoAll
 				SetState {out_of_comp}
 	IF:	DistToRteGE 100
-		DO:	SetState {goingback}
+		DO:	SetState {tusker_run}
 	IF:	All
 			Expr {stopwatchelapsedseconds[getvar[lootclock]]>getvar[lootTime]}
 		DO:	DoAll
 				SetState {loot}
-	IF:	PSecsInStateGE 300
-		DO:	SetState {goingback}
 ~~ }
 STATE: {loot} ~~ {
 	IF:	Always
@@ -151,13 +134,19 @@ STATE: {out_of_comp} ~~ {
 	IF:	Always
 		DO:	Chat {/vt nav load ah_recomp}
 	IF:	NavEmpty
-		DO:	SetState {goingback}
+		DO:	SetState {tusker_run}
 ~~ }
 STATE: {tusker_run} ~~ {
 	IF:	SecsInStateGE 900
-		DO:	SetState {goingback}
+		DO:	SetState {tusker_run}
 	IF:	Death
 		DO:	SetState {death}
+	IF:	Always
+		DO:	DoAll
+				Chat {/vt opt set enablenav true}
+				Chat {/vt opt set enablebuffing true}
+				Chat {/vt opt set enablecombat false}
+				ChatExpr {\/vt nav load aphus_route+getvar[navNumber]}
 	IF:	NavEmpty
 		DO:	DoAll				
 				ChatExpr {\/vt nav load aphus_circuit+getvar[navNumber]}
diff --git a/aphus.met b/aphus.met
index 0a47072..8e43b26 100644
--- a/aphus.met
+++ b/aphus.met
@@ -11,7 +11,7 @@ n
 n
 n
 n
-28
+24
 i
 16
 i
@@ -97,7 +97,7 @@ i
 i
 0
 s
-goingback
+tusker_run
 s
 death
 i
@@ -215,71 +215,6 @@ hunt
 s
 Default
 i
-8
-i
-1
-i
-0
-s
-death
-s
-Default
-i
-6
-i
-1
-i
-900
-s
-goingback
-s
-goingback
-i
-8
-i
-1
-i
-0
-s
-death
-s
-goingback
-i
-1
-i
-3
-i
-0
-TABLE
-2
-K
-V
-n
-n
-5
-i
-2
-s
-/vt opt set enablenav true
-i
-2
-s
-/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
-tusker_run
-s
-goingback
-i
 1
 i
 2
@@ -387,7 +322,7 @@ n
 s
 s
 s
-goingback
+tusker_run
 s
 r
 d
@@ -446,7 +381,7 @@ dist
 d
 100
 s
-goingback
+tusker_run
 s
 hunt
 i
@@ -487,16 +422,6 @@ loot
 s
 hunt
 i
-22
-i
-1
-i
-300
-s
-goingback
-s
-hunt
-i
 1
 i
 3
@@ -661,7 +586,7 @@ i
 i
 0
 s
-goingback
+tusker_run
 s
 out_of_comp
 i
@@ -671,7 +596,7 @@ i
 i
 900
 s
-goingback
+tusker_run
 s
 tusker_run
 i
@@ -685,6 +610,46 @@ death
 s
 tusker_run
 i
+1
+i
+3
+i
+0
+TABLE
+2
+K
+V
+n
+n
+4
+i
+2
+s
+/vt opt set enablenav true
+i
+2
+s
+/vt opt set enablebuffing true
+i
+2
+s
+/vt opt set enablecombat false
+i
+8
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+\/vt nav load aphus_route+getvar[navNumber]
+s
+tusker_run
+i
 7
 i
 3