diff --git a/af/viridian_rise.af b/af/viridian_rise.af
index 7b471dd..77cbb3b 100644
--- a/af/viridian_rise.af
+++ b/af/viridian_rise.af
@@ -77,16 +77,15 @@ STATE: {Hunt}
 			Expr {getvar[isLeader]}
 			ChatMatch {the acidic mist!}
 		DO:	CallState {vr_gas_dodge} {Hunt}
-	IF:	All
-			ChatMatch {^.* I also have aids has died!$}
+	IF:	All			
+			ChatCapture {^Your fellow (?<who>\w[\w ]*\w) has died!$} {}
+			Expr {getvar[capturegroup_who]==getvar[followTarget]}
 			Expr {getvar[isLeader]==0}
 		DO:	DoAll
 				ChatExpr {\/f +getvar[followTarget] is dead\. Run away\!}
 				SetState {run_away}
 	IF:	ChatMatch {^.*has died!$}	
-		DO: DoAll
-				Chat {/f I SAW DEATH!}
-				DoExpr {setvar[deathCount, getvar[deathCount]+1]}
+		DO: CallState {count_death}	{Hunt}		
 	IF: All
 			Expr {getvar[deathCount]==1}
 			Not Expr {getvar[deathClock]}
@@ -147,7 +146,14 @@ STATE: {Hunt}
 		DO:	DoAll
 				Chat {/ub fellow quit}
 				SetState {Default}
-				
+
+STATE: {count_death}
+	IF: Always
+		DO: DoAll
+				Chat {/f I SAW DEATH!}
+				DoExpr {setvar[deathCount, getvar[deathCount]+1]}
+				Return
+
 STATE: {run_away}
 	IF:	Always
 		DO:	DoAll
diff --git a/met/viridian_rise.met b/met/viridian_rise.met
index bfc3b31..a6cda16 100644
--- a/met/viridian_rise.met
+++ b/met/viridian_rise.met
@@ -11,7 +11,7 @@ n
 n
 n
 n
-43
+44
 i
 1
 i
@@ -463,11 +463,37 @@ K
 V
 n
 n
-2
+3
 i
-4
+28
+TABLE
+2
+k
+v
+n
+n
+2
 s
-^.* I also have aids has died!$
+p
+s
+^Your fellow (?<who>\w[\w ]*\w) has died!$
+s
+c
+s
+
+i
+26
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+getvar[capturegroup_who]==getvar[followTarget]
 i
 26
 TABLE
@@ -510,33 +536,24 @@ Hunt
 i
 4
 i
-3
+5
 s
 ^.*has died!$
 TABLE
 2
-K
-V
-n
-n
-2
-i
-2
-s
-/f I SAW DEATH!
-i
-7
-TABLE
-2
 k
 v
 n
 n
-1
+2
 s
-e
+st
 s
-setvar[deathCount, getvar[deathCount]+1]
+count_death
+s
+ret
+s
+Hunt
 s
 Hunt
 i
@@ -1189,6 +1206,42 @@ K
 V
 n
 n
+3
+i
+2
+s
+/f I SAW DEATH!
+i
+7
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+setvar[deathCount, getvar[deathCount]+1]
+i
+6
+i
+0
+s
+count_death
+i
+1
+i
+3
+i
+0
+TABLE
+2
+K
+V
+n
+n
 6
 i
 2