diff --git a/bore.af b/bore.af
index 96a3c6b..ab0aaae 100644
--- a/bore.af
+++ b/bore.af
@@ -57,6 +57,8 @@ STATE: {death} ~~ {
 STATE: {hunt} ~~ {
 	IF:	Always
 		DO:	Chat {/vt opt set enablecombat false}
+	IF: Expr {getvar[lootTime] == 0}	
+		DO:	DoExpr {setvar[lootTime, 21600]}
 	IF:	Death
 		DO:	DoAll
 				Chat {/a I died! But I will comeback!}
@@ -139,11 +141,6 @@ STATE: {Default} ~~ {
 				DoExpr {setvar[lootclock,stopwatchcreate[]]}
 				DoExpr {stopwatchstart[getvar[lootclock]]}
 				SetState {hunt}
-	IF: Any 
-			Expr {getvar[lootTime] == 0}
-			Not Expr {touchvar[lootTime]}
-			Not Expr {testvar[lootTime]}
-		DO:	DoExpr {setvar[lootTime, 21600]}
 ~~ }
 STATE: {avoid_portal} ~~ {
 	IF:	SecsInStateGE 1
diff --git a/bore.met b/bore.met
index 89f08fc..fa52e96 100644
--- a/bore.met
+++ b/bore.met
@@ -92,6 +92,34 @@ s
 s
 hunt
 i
+26
+i
+7
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+getvar[lootTime] == 0
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+setvar[lootTime, 21600]
+s
+hunt
+i
 8
 i
 3
@@ -834,87 +862,6 @@ hunt
 s
 Default
 i
-3
-i
-7
-TABLE
-2
-K
-V
-n
-n
-3
-i
-26
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-getvar[lootTime] == 0
-i
-21
-TABLE
-2
-K
-V
-n
-n
-1
-i
-26
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-touchvar[lootTime]
-i
-21
-TABLE
-2
-K
-V
-n
-n
-1
-i
-26
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-testvar[lootTime]
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-setvar[lootTime, 21600]
-s
-Default
-i
 6
 i
 8