diff --git a/af/viridian_rise.af b/af/viridian_rise.af
index 853fab9..16f3c0c 100644
--- a/af/viridian_rise.af
+++ b/af/viridian_rise.af
@@ -21,6 +21,10 @@
 ~~ ============================================================
 
 STATE: {Default}
+	IF: Always
+		DO: DoAll
+				DoExpr {touchvar[deathCount]}
+				DoExpr {touchvar[deathClock]}
 	IF:	All
 			Expr {getvar[isLeader]}
 		DO:	DoAll
@@ -72,16 +76,20 @@ STATE: {Hunt}
 	IF:	All
 			Expr {getvar[isLeader]}
 			ChatMatch {the acidic mist!}
-		DO:	CallState {vr_gas_dodge} {Hunt}		
+		DO:	CallState {vr_gas_dodge} {Hunt}
 	IF:	All
-			ChatCapture {(?<who>\w[\w ]*\w) +getvar[followTarget] has died!$} {}
+			ChatMatch {^.* +getvar[followTarget] has died!$}		
 			Expr {getvar[isLeader]==0}
-		DO:	SetState {run_away}
-	IF:	ChatCapture {(?<who>\w[\w ]*\w) has died!$} {}
+		DO:	DoAll
+				ChatExpr {\/f +getvar[followTarget] dead...he dead.}
+				SetState {run_away}
+	IF:	ChatMatch {^.*has died!$}	
 		DO: DoAll
 				Chat {/f I SAW DEATH!}
 				DoExpr {setvar[deathCount, getvar[deathCount]+1]}
-	IF: Expr {getvar[deathCount]==1}
+	IF: All
+			Expr {getvar[deathCount]==1}
+			Not Expr {getvar[deathClock]}
 		DO: DoAll
 				Chat {/f deathClock started}
 				DoExpr {setvar[deathClock,stopwatchcreate[]]}
@@ -92,7 +100,7 @@ STATE: {Hunt}
 			Expr {getvar[deathClock]}
 			Expr {stopwatchelapsedseconds[getvar[deathClock]]>60}
 		DO: DoAll
-				Chat {/f deathClock stoppped}
+				Chat {/f deathClock stopped}
 				DoExpr {clearvar[deathCount]}
 				DoExpr {clearvar[deathClock]}
 	IF:	All
diff --git a/met/viridian_rise.met b/met/viridian_rise.met
index 7c11723..2ac8c38 100644
--- a/met/viridian_rise.met
+++ b/met/viridian_rise.met
@@ -11,7 +11,48 @@ n
 n
 n
 n
-42
+43
+i
+1
+i
+3
+i
+0
+TABLE
+2
+K
+V
+n
+n
+2
+i
+7
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+touchvar[deathCount]
+i
+7
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+touchvar[deathClock]
+s
+Default
 i
 2
 i
@@ -415,7 +456,7 @@ Hunt
 i
 2
 i
-1
+3
 TABLE
 2
 K
@@ -424,22 +465,9 @@ n
 n
 2
 i
-28
-TABLE
-2
-k
-v
-n
-n
-2
+4
 s
-p
-s
-(?<who>\w[\w ]*\w) +getvar[followTarget] has died!$
-s
-c
-s
-
+^.* +getvar[followTarget] has died!$
 i
 26
 TABLE
@@ -453,29 +481,38 @@ s
 e
 s
 getvar[isLeader]==0
-s
-run_away
-s
-Hunt
+TABLE
+2
+K
+V
+n
+n
+2
 i
-28
-i
-3
+8
 TABLE
 2
 k
 v
 n
 n
-2
+1
 s
-p
+e
 s
-(?<who>\w[\w ]*\w) has died!$
+\/f +getvar[followTarget] dead...he dead.
+i
+1
 s
-c
+run_away
 s
-
+Hunt
+i
+4
+i
+3
+s
+^.*has died!$
 TABLE
 2
 K
@@ -503,11 +540,20 @@ setvar[deathCount, getvar[deathCount]+1]
 s
 Hunt
 i
-26
+2
 i
 3
 TABLE
 2
+K
+V
+n
+n
+2
+i
+26
+TABLE
+2
 k
 v
 n
@@ -517,6 +563,28 @@ s
 e
 s
 getvar[deathCount]==1
+i
+21
+TABLE
+2
+K
+V
+n
+n
+1
+i
+26
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+getvar[deathClock]
 TABLE
 2
 K
@@ -622,7 +690,7 @@ n
 i
 2
 s
-/f deathClock stoppped
+/f deathClock stopped
 i
 7
 TABLE