diff --git a/source/game/game.cpp b/source/game/game.cpp
index 4d6250113..9f424e5ae 100644
--- a/source/game/game.cpp
+++ b/source/game/game.cpp
@@ -93,9 +93,9 @@ char	*Str="Sponge\nBob\nSquare\nPants";
 }
 
 /*****************************************************************************/
-void	CGameScene::think()
+void	CGameScene::think(int _frames)
 {
-	for(int i=0;i<GameState::getFramesSinceLast();i++)
+	for(int i=0;i<_frames;i++)
 	{
 		X+=Dx; Y+=Dy;
 		if (X<0+64)		{X=0+64;	Dx=-Dx;}
diff --git a/source/game/game.h b/source/game/game.h
index 8ecc980cf..dca50896f 100644
--- a/source/game/game.h
+++ b/source/game/game.h
@@ -21,7 +21,7 @@ public:
 	void init();
 	void shutdown();
 	void render();
-	void think();
+	void think(int _frames);
 	char *getSceneName()	{return "Game";}
 
 	
diff --git a/source/paul/paul.cpp b/source/paul/paul.cpp
index 60fc81581..cc8594617 100644
--- a/source/paul/paul.cpp
+++ b/source/paul/paul.cpp
@@ -159,7 +159,7 @@ int svol=255;
 VECTOR ppos;
 int psp=0;
 
-void CPaulScene::think()
+void CPaulScene::think(int _frames)
 {
 	int				pad;
 	int				sfxId=-1;
diff --git a/source/paul/paul.h b/source/paul/paul.h
index a12a5148e..5a74efaee 100644
--- a/source/paul/paul.h
+++ b/source/paul/paul.h
@@ -39,7 +39,7 @@ public:
 	void init();
 	void shutdown();
 	void render();
-	void think();
+	void think(int _frames);
 	char *getSceneName()			{return"PaulsScene";}
 };
 
diff --git a/source/system/gstate.cpp b/source/system/gstate.cpp
index 0861eca60..795867e62 100644
--- a/source/system/gstate.cpp
+++ b/source/system/gstate.cpp
@@ -62,7 +62,7 @@ void GameState::think()
 			}
 		}
 	ASSERT(s_currentScene);
-	s_currentScene->think();
+	s_currentScene->think(getFramesSinceLast());
 }
 
 
diff --git a/source/system/gstate.h b/source/system/gstate.h
index 1deb5abc5..b51af8b5a 100644
--- a/source/system/gstate.h
+++ b/source/system/gstate.h
@@ -30,7 +30,7 @@ public:
 	virtual void	init()=0;
 	virtual void	shutdown()=0;
 	virtual void	render()=0;
-	virtual void	think()=0;
+	virtual void	think(int _frames)=0;
 	virtual char	*getSceneName()=0;
 
 protected:
diff --git a/source/system/main.cpp b/source/system/main.cpp
index 9ca8f64ff..99ae9d9ca 100644
--- a/source/system/main.cpp
+++ b/source/system/main.cpp
@@ -89,13 +89,17 @@ void	MainLoop()
 {
 	while (1)
 	{
+		int	frames;
+
+		frames=GameState::getFramesSinceLast();
+		
 		GameState::think();
 		GameState::render();
 
-		CSoundMediator::think(GameState::getTimeSinceLast());
+		CSoundMediator::think(frames);
 		
 #ifdef __USER_paul__
-		s_paulScene.think();
+		s_paulScene.think(frames);
 		s_paulScene.render();
 #endif
 
@@ -120,8 +124,7 @@ void	MainLoop()
 			if (PadGetDown(0) & PAD_START) SaveScreen(VidGetScreen()->Draw.clip);
 	#endif
 
-		// PKG - Moved vram viewer to SELECT on pad 2 for art dev machines
-			if (PadGetDown(0) & PAD_SELECT) VRamViewer();
+		if (PadGetDown(0) & PAD_SELECT) VRamViewer();
 #endif
 	}
 }