diff --git a/af/viridian_rise.af b/af/viridian_rise.af
index 7d7d22b..7931d95 100644
--- a/af/viridian_rise.af
+++ b/af/viridian_rise.af
@@ -26,28 +26,19 @@ STATE: {Default}
 				DoExpr {clearvar[deathCount]}
 				DoExpr {clearvar[deathClock]}
 				DoExpr {clearvar[vrRunbackNavLoaded]}
+				Chat {/vt opt set enablenav true}
+				Chat {/vt opt set navpriorityboost true}
+				ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}				
 	IF:	All
 			Expr {getvar[isLeader]}
-		DO:	DoAll
-				Chat {/vt opt set enablecombat true}
-				Chat {/vt opt set enablelooting true}
-				Chat {/vt opt set enablebuffing true}
-				Chat {/vt opt set enablenav true}
-				Chat {/vt opt set navpriorityboost false}
-				ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
+		DO:	DoAll				
 				Chat {/ub fellow create Viridian Rise Hunt}
 				DoExpr {setvar[pickFlowers, 1]}
 				DoExpr {setvar[pickupRange, 15]}
 				SetState {vr_runback}
 	IF:	All
 			Expr {getvar[isLeader]==0}
-		DO:	DoAll
-				Chat {/vt opt set enablecombat true}
-				Chat {/vt opt set enablelooting true}
-				Chat {/vt opt set enablebuffing true}
-				Chat {/vt opt set enablenav true}
-				Chat {/vt opt set navpriorityboost true}
-				ChatExpr {\/vt opt set attackdistance +getvar[attackRange]}
+		DO:	DoAll								
 				SetState {vr_runback}
 
 STATE: {Hunt}
@@ -217,7 +208,7 @@ STATE: {run_away}
 				Chat {/vt opt set enablecombat false}
 				Chat {/vt opt set navpriorityboost true}
 				DoExpr {clearvar[vrRunbackNavLoaded]}
-				SetState {vr_runback}
+				SetState {Default}
 	IF:	ChatMatch {^\[Fellowship\].*(say|says), \"#tomuchviteaviridianrise\"$}
 		DO:	SetState {vitae_run}
 
diff --git a/met/viridian_rise.met b/met/viridian_rise.met
index 938eec4..6d24e19 100644
--- a/met/viridian_rise.met
+++ b/met/viridian_rise.met
@@ -24,7 +24,7 @@ K
 V
 n
 n
-3
+6
 i
 7
 TABLE
@@ -64,6 +64,27 @@ s
 e
 s
 clearvar[vrRunbackNavLoaded]
+i
+2
+s
+/vt opt set enablenav true
+i
+2
+s
+/vt opt set navpriorityboost true
+i
+8
+TABLE
+2
+k
+v
+n
+n
+1
+s
+e
+s
+\/vt opt set attackdistance +getvar[attackRange]
 s
 Default
 i
@@ -96,40 +117,7 @@ K
 V
 n
 n
-10
-i
-2
-s
-/vt opt set enablecombat true
-i
-2
-s
-/vt opt set enablelooting true
-i
-2
-s
-/vt opt set enablebuffing true
-i
-2
-s
-/vt opt set enablenav true
-i
-2
-s
-/vt opt set navpriorityboost false
-i
-8
-TABLE
-2
-k
-v
-n
-n
-1
-s
-e
-s
-\/vt opt set attackdistance +getvar[attackRange]
+4
 i
 2
 s
@@ -196,40 +184,7 @@ K
 V
 n
 n
-7
-i
-2
-s
-/vt opt set enablecombat true
-i
-2
-s
-/vt opt set enablelooting true
-i
-2
-s
-/vt opt set enablebuffing true
-i
-2
-s
-/vt opt set enablenav true
-i
-2
-s
-/vt opt set navpriorityboost true
-i
-8
-TABLE
-2
-k
-v
-n
-n
 1
-s
-e
-s
-\/vt opt set attackdistance +getvar[attackRange]
 i
 1
 s
@@ -1836,7 +1791,7 @@ clearvar[vrRunbackNavLoaded]
 i
 1
 s
-vr_runback
+Default
 s
 run_away
 i