diff --git a/android/modules/goatoh.mod.hsp b/android/modules/goatoh.mod.hsp
index ff7e065..1d0f84d 100644
--- a/android/modules/goatoh.mod.hsp
+++ b/android/modules/goatoh.mod.hsp
@@ -23,7 +23,8 @@ New \
 
 	direction.insNum = p_initDirection
 
-	walking.insNum = False
+	walking.insNum = True
+	running.insNum = False
 	eating.insNum = False
 	openingEyes.insNum = False
 	openingMouth.insNum = False
@@ -85,13 +86,24 @@ Draw \
 	Pos posX.p_insId, posY.p_insId
 	CelPut BUFFER_GOATOH_LEG
 
-	Interval p_insId
+	Interval@Goatoh p_insId
 
 	Return
 
 #deffunc local \
 Interval \
 		int	p_insId
+	If walking.p_insId {
+		Walk@Goatoh p_insId
+	}
+	Else: If running.p_insId {
+		DoRun@Goatoh p_insId
+	}
+
+	If eating.p_insId {
+		Eat@Goatoh p_insId
+	}
+
 	frame.p_insId++
 
 	Return