diff --git a/af/viridian_rise.af b/af/viridian_rise.af
index 378ee43..12640f7 100644
--- a/af/viridian_rise.af
+++ b/af/viridian_rise.af
@@ -25,6 +25,7 @@ STATE: {Default}
 		DO: DoAll
 				DoExpr {touchvar[deathCount]}
 				DoExpr {touchvar[deathClock]}
+				DoExpr {clearvar[vrRunbackNavLoaded]}
 	IF:	All
 			Expr {getvar[isLeader]}
 		DO:	DoAll
@@ -83,6 +84,8 @@ STATE: {Hunt}
 		DO:	Chat {/fellowship #tomuchviteaviridianrise}
 	IF:	ChatMatch {^\[Fellowship\].*(say|says), \"#tomuchviteaviridianrise\"$}
 		DO:	SetState {vitae_run}
+	IF:	ChatMatch {^\[Fellowship\].*(say|says), \"#vitaerundoneviridianrise\"$}
+		DO:	SetState {Default}
 	IF:	All			
 			ChatCapture {^Your fellow (?<who>\w[\w ]*\w) has died!$} {}
 			Expr {getvar[capturegroup_who]==getvar[followTarget]}
@@ -218,6 +221,11 @@ STATE: {run_away}
 		DO:	SetState {vitae_run}
 
 STATE: {vitae_run}
+	IF:	Death
+		DO:	DoAll
+				DoExpr {clearvar[deathCount]}
+				DoExpr {clearvar[deathClock]}
+				SetState {death}
 	IF: Always
 		DO: DoAll
 				Chat {/vt opt set enablecombat false}
diff --git a/met/viridian_rise.met b/met/viridian_rise.met
index 17d2447..7e7d6fd 100644
--- a/met/viridian_rise.met
+++ b/met/viridian_rise.met
@@ -11,7 +11,7 @@ n
 n
 n
 n
-76
+78
 i
 1
 i
@@ -24,7 +24,7 @@ K
 V
 n
 n
-2
+3
 i
 7
 TABLE
@@ -51,6 +51,19 @@ s
 e
 s
 touchvar[deathClock]
+i
+7
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+clearvar[vrRunbackNavLoaded]
 s
 Default
 i
@@ -509,6 +522,16 @@ vitae_run
 s
 Hunt
 i
+4
+i
+1
+s
+^\[Fellowship\].*(say|says), \"#vitaerundoneviridianrise\"$
+s
+Default
+s
+Hunt
+i
 2
 i
 3
@@ -1818,6 +1841,51 @@ vitae_run
 s
 run_away
 i
+8
+i
+3
+i
+0
+TABLE
+2
+K
+V
+n
+n
+3
+i
+7
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+clearvar[deathCount]
+i
+7
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+clearvar[deathClock]
+i
+1
+s
+death
+s
+vitae_run
+i
 1
 i
 3