diff --git a/source/friend/fdata.cpp b/source/friend/fdata.cpp
index a77d64086..f1be2d423 100644
--- a/source/friend/fdata.cpp
+++ b/source/friend/fdata.cpp
@@ -43,6 +43,10 @@
 #include <ACTOR_MERMAIDMAN_Anim.h>
 #endif
 
+#ifndef __ANIM_GARY_HEADER__
+#include <ACTOR_GARY_Anim.h>
+#endif
+
 
 CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] =
 {
@@ -56,7 +60,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] =
 	},
 
 	{	// NPC_FRIEND_GARY
-		ACTORS_CLAM_SBK,
+		ACTORS_GARY_SBK,
 		3,
 		128,
 		false,
diff --git a/source/friend/fgary.cpp b/source/friend/fgary.cpp
index 0fe729dc7..e4c6273f7 100644
--- a/source/friend/fgary.cpp
+++ b/source/friend/fgary.cpp
@@ -22,7 +22,7 @@
 
 void CNpcGaryFriend::think( int _frames )
 {
-	CNpcThing::think(_frames);
+	CNpcFriend::think(_frames);
 
 	s8 multiplier = -1 + ( 2 * m_extension );
 	s32 maxHeight = 20;
diff --git a/tools/MapEdit/actor.ini b/tools/MapEdit/actor.ini
index ed15659d6..8f3aa3e1b 100644
--- a/tools/MapEdit/actor.ini
+++ b/tools/MapEdit/actor.ini
@@ -30,14 +30,14 @@ Collision=0
 Health=0
 AttackStrength=0
 
-#[Gary]
-#Gfx=..\..\graphics\characters\
-#WayPoints=0
-#Speed=3
-#TurnRate=0
-#Collision=0
-#Health=0
-#AttackStrength=0
+[Gary]
+Gfx=..\..\graphics\characters\gary\render\psx\gary_idle0000.bmp
+WayPoints=16
+Speed=3
+TurnRate=0
+Collision=0
+Health=0
+AttackStrength=0
 
 [Krusty]
 Gfx=..\..\graphics\characters\Krusty\render\psx\Krusty_IdleBreathe0000.bmp
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 6e612e30f..f34a9e830 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -2016,6 +2016,10 @@ SOURCE=..\..\..\out\USA\include\ACTOR_FLYINGDUTCHMAN_Anim.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\out\USA\include\ACTOR_GARY_Anim.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\out\USA\include\ACTOR_GHOST_Anim.h
 # End Source File
 # Begin Source File