diff --git a/af/viridian_rise.af b/af/viridian_rise.af
index 9a26e08..7d6f5d7 100644
--- a/af/viridian_rise.af
+++ b/af/viridian_rise.af
@@ -141,8 +141,8 @@ STATE: {Hunt}
 				SetState {Hunt}
 	IF:	All
 			Expr {getvar[isLeader]}
-			Expr {coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbytemplatetype[53011]]]<=getvar[pickupRange]}
-			Expr {wobjectgetname[wobjectfindnearestbytemplatetype[53011]]==Amber Crystal}
+			Expr {coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbyobjectclass[8]]]<=getvar[pickupRange]}
+			Expr {wobjectgetname[wobjectfindnearestbyobjectclass[8]]==Amber Crystal}
 			Expr {getvar[pickFlowers]==1}
 		DO:	SetState {picking_flowers}
 	IF:	All
@@ -270,13 +270,13 @@ STATE: {recomp}
 		DO:	SetWatchdog 3 300 {Default}	
 
 STATE: {picking_flowers} ~~ {
-	IF:	Expr {coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbytemplatetype[53011]]]<=getvar[pickupRange]+3}
+	IF:	Expr {coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbyobjectclass[8]]]<=getvar[pickupRange]+3}
 		DO:	DoAll
 				DoExpr {setvar[ObjectClose, 1]}
 				EmbedNav nav2__pickup_nav {pickup.nav}
 	IF:	All
 			Expr {getvar[ObjectClose]==1}
-			Expr {coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbytemplatetype[53011]]]>getvar[pickupRange]+4}
+			Expr {coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbyobjectclass[8]]]>getvar[pickupRange]+4}
 		DO:	DoAll
 				DoExpr {setvar[ObjectClose, 0]}
 				SetState {Hunt}
@@ -315,6 +315,6 @@ STATE: {stuck}
 				SetState {Default}
 
 NAV: nav2__pickup_nav circular ~~ {
-	cht 6.85679616481066 -19.8018191655477 2.08332513769468E-05 {/vt mexec actiontryuseitem[wobjectfindnearestbytemplatetype[53011]]}
+	cht 6.85679616481066 -19.8018191655477 2.08332513769468E-05 {/vt mexec actiontryuseitem[wobjectfindnearestbyobjectclass[8]]}
 	pau 6.85679616481066 -19.8018191655477 2.08332513769468E-05 10000
 ~~ }
\ No newline at end of file
diff --git a/met/viridian_rise.met b/met/viridian_rise.met
index 6df1ec6..89df689 100644
--- a/met/viridian_rise.met
+++ b/met/viridian_rise.met
@@ -1146,7 +1146,7 @@ n
 s
 e
 s
-coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbytemplatetype[53011]]]<=getvar[pickupRange]
+coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbyobjectclass[8]]]<=getvar[pickupRange]
 i
 26
 TABLE
@@ -1159,7 +1159,7 @@ n
 s
 e
 s
-wobjectgetname[wobjectfindnearestbytemplatetype[53011]]==Amber Crystal
+wobjectgetname[wobjectfindnearestbyobjectclass[8]]==Amber Crystal
 i
 26
 TABLE
@@ -1989,7 +1989,7 @@ n
 s
 e
 s
-coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbytemplatetype[53011]]]<=getvar[pickupRange]+3
+coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbyobjectclass[8]]]<=getvar[pickupRange]+3
 TABLE
 2
 K
@@ -2013,7 +2013,7 @@ setvar[ObjectClose, 1]
 i
 4
 ba
-243
+238
 pickup.nav
 2
 uTank2 NAV 1.2
@@ -2024,7 +2024,7 @@ uTank2 NAV 1.2
 -19.8018191655477
 2.08332513769468E-05
 0
-/vt mexec actiontryuseitem[wobjectfindnearestbytemplatetype[53011]]
+/vt mexec actiontryuseitem[wobjectfindnearestbyobjectclass[8]]
 3
 6.85679616481066
 -19.8018191655477
@@ -2069,7 +2069,7 @@ n
 s
 e
 s
-coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbytemplatetype[53011]]]>getvar[pickupRange]+4
+coordinatedistancewithz[getplayercoordinates[], wobjectgetphysicscoordinates[wobjectfindnearestbyobjectclass[8]]]>getvar[pickupRange]+4
 TABLE
 2
 K