diff --git a/Graphics/levels/Chapter01/Level02/Level02.MEX b/Graphics/levels/Chapter01/Level02/Level02.MEX
index 24fded981..55512a91f 100644
Binary files a/Graphics/levels/Chapter01/Level02/Level02.MEX and b/Graphics/levels/Chapter01/Level02/Level02.MEX differ
diff --git a/Graphics/levels/Chapter01/Level02/level02.Mep b/Graphics/levels/Chapter01/Level02/level02.Mep
index 0f35824c5..707f8875f 100644
Binary files a/Graphics/levels/Chapter01/Level02/level02.Mep and b/Graphics/levels/Chapter01/Level02/level02.Mep differ
diff --git a/makefile.gaz b/makefile.gaz
index 3b7c1e501..c1b8bef97 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -361,7 +361,8 @@ triggers_src :=		trigger \
 					twindleft \
 					twindright \
 					toilgeyser \
-					tspeech
+					tspeech \
+					tbuttfly
 
 
 utils_src :=		utils \
diff --git a/source/enemy/nmjfish.cpp b/source/enemy/nmjfish.cpp
index fb6dcb217..aaf6eb1f8 100644
--- a/source/enemy/nmjfish.cpp
+++ b/source/enemy/nmjfish.cpp
@@ -749,6 +749,7 @@ void CNpcMotherJellyfishEnemy::render()
 			SprFrame = m_actorGfx->Render(renderPos,m_animNo,( m_frame >> 8 ),false);
 			m_actorGfx->RotateScale( SprFrame, renderPos, 0, m_renderScale, m_renderScale );
 
+			setShadeTex(SprFrame,0);
 			setRGB0( SprFrame, ( m_RGB & 255 ), ( ( m_RGB >> 8 ) & 255 ), ( ( m_RGB >> 16 ) & 255 ) );
 
 			sBBox boundingBox = m_actorGfx->GetBBox();
diff --git a/source/jellfish/jellfish.cpp b/source/jellfish/jellfish.cpp
index 00963271b..39f84f5f2 100644
--- a/source/jellfish/jellfish.cpp
+++ b/source/jellfish/jellfish.cpp
@@ -71,6 +71,7 @@ void CJellyfishGenerator::init()
 				case 2:
 				{
 					m_level = 3;
+					m_on = false;
 
 					break;
 				}
diff --git a/source/jellfish/jellfish.h b/source/jellfish/jellfish.h
index 568c63018..7b4f3ba7d 100644
--- a/source/jellfish/jellfish.h
+++ b/source/jellfish/jellfish.h
@@ -28,6 +28,7 @@ public:
 	static void			init();
 	static void			think( int _frames, CLevel *level );
 	static void			decCounter();
+	static void			start()										{m_on=true;}
 protected:
 	static u8			m_jellyfishCount;
 	static s32			m_timer;
diff --git a/source/triggers/trigger.cpp b/source/triggers/trigger.cpp
index 163d247dc..9488af19e 100644
--- a/source/triggers/trigger.cpp
+++ b/source/triggers/trigger.cpp
@@ -167,6 +167,10 @@
 #include "triggers\tlook.h"
 #endif
 
+#ifndef __TRIGGERS_TBUTTFLY_H__
+#include "triggers\tbuttfly.h"
+#endif
+
 #ifndef __GAME_GAME_H__
 #include "game\game.h"
 #endif
@@ -435,6 +439,10 @@ CTrigger	*trigger;
 			trigger = (CLookTrigger*)new("LookTrigger") CLookTrigger();
 			break;
 
+		case TRIGGER_BUTTERFLY_ON:
+			trigger = (CButterflyTrigger*)new("ButterflyTrigger") CButterflyTrigger();
+			break;
+
 		default:
 			trigger=NULL;
 	}
diff --git a/source/triggers/trigger.h b/source/triggers/trigger.h
index bdd26c723..de9fda59e 100644
--- a/source/triggers/trigger.h
+++ b/source/triggers/trigger.h
@@ -68,6 +68,7 @@ enum TRIGGER_TYPE
 	TRIGGER_SPEECH_USE_BUBBLE,
 	TRIGGER_SPEECH_WEIGHT,
 	TRIGGER_CAMERAYPOSITIONTRIGGER,
+	TRIGGER_BUTTERFLY_ON,
 
 // Code based triggers
 	TRIGGER_PLATFORM,
diff --git a/tools/Data/bin/MkLevel.ini b/tools/Data/bin/MkLevel.ini
index a578a777f..997b54bba 100644
--- a/tools/Data/bin/MkLevel.ini
+++ b/tools/Data/bin/MkLevel.ini
@@ -176,6 +176,7 @@ SpeechFirstBubble=41
 SpeechUseBubble=42
 SpeechWeight=43
 CameraYPositionTrigger=44
+StartButterfly=45
 
 ################################################
 # FX
diff --git a/tools/MapEdit/trigger.ini b/tools/MapEdit/trigger.ini
index a2d6f336d..b70ff1fb1 100644
--- a/tools/MapEdit/trigger.ini
+++ b/tools/MapEdit/trigger.ini
@@ -96,4 +96,6 @@ HasBox=1
 [SpeechWeight]
 
 [CameraYPositionTrigger]
-HasVal=1
\ No newline at end of file
+HasVal=1
+
+[StartButterfly]
\ No newline at end of file
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 3b9f0d800..63a213408 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -2313,6 +2313,14 @@ SOURCE=..\..\..\source\triggers\tboss.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\triggers\tbuttfly.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\source\triggers\tbuttfly.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\triggers\tcamlock.cpp
 # End Source File
 # Begin Source File