diff --git a/stepmania/src/ScreenBookkeeping.cpp b/stepmania/src/ScreenBookkeeping.cpp
index ffe4c47736..b27def1bcb 100644
--- a/stepmania/src/ScreenBookkeeping.cpp
+++ b/stepmania/src/ScreenBookkeeping.cpp
@@ -61,21 +61,21 @@ void ScreenBookkeeping::Input( const InputEventPlus &input )
 	Screen::Input( input );	// default handler
 }
 
-void ScreenBookkeeping::MenuLeft( PlayerNumber pn )
+void ScreenBookkeeping::MenuLeft( const InputEventPlus &input )
 {
 	m_View = (View)(m_View-1);
 	CLAMP( (int&)m_View, 0, NUM_VIEWS-1 );
 	ChangeView( m_View );
 }
 
-void ScreenBookkeeping::MenuRight( PlayerNumber pn )
+void ScreenBookkeeping::MenuRight( const InputEventPlus &input )
 {
 	m_View = (View)(m_View+1);
 	CLAMP( (int&)m_View, 0, NUM_VIEWS-1 );
 	ChangeView( m_View );
 }
 
-void ScreenBookkeeping::MenuStart( PlayerNumber pn )
+void ScreenBookkeeping::MenuStart( const InputEventPlus &input )
 {
 	if( !IsTransitioning() )
 	{
@@ -84,7 +84,7 @@ void ScreenBookkeeping::MenuStart( PlayerNumber pn )
 	}
 }
 
-void ScreenBookkeeping::MenuBack( PlayerNumber pn )
+void ScreenBookkeeping::MenuBack( const InputEventPlus &input )
 {
 	if(!IsTransitioning())
 	{
@@ -93,11 +93,11 @@ void ScreenBookkeeping::MenuBack( PlayerNumber pn )
 	}
 }
 
-void ScreenBookkeeping::MenuCoin( PlayerNumber pn )
+void ScreenBookkeeping::MenuCoin( const InputEventPlus &input )
 {
 	ChangeView( m_View );
 
-	Screen::MenuCoin( pn );
+	Screen::MenuCoin( input );
 }
 
 static LocalizedString ALL_TIME		( "ScreenBookkeeping", "All-time Total:" );
diff --git a/stepmania/src/ScreenBookkeeping.h b/stepmania/src/ScreenBookkeeping.h
index ce9cd8ee76..c22f8bacbc 100644
--- a/stepmania/src/ScreenBookkeeping.h
+++ b/stepmania/src/ScreenBookkeeping.h
@@ -17,11 +17,11 @@ public:
 	virtual void Update( float fDelta );
 	virtual void Input( const InputEventPlus &input );
 
-	virtual void MenuLeft( PlayerNumber pn );
-	virtual void MenuRight( PlayerNumber pn );
-	virtual void MenuStart( PlayerNumber pn );
-	virtual void MenuBack( PlayerNumber pn );
-	void MenuCoin( PlayerNumber pn );
+	virtual void MenuLeft( const InputEventPlus &input );
+	virtual void MenuRight( const InputEventPlus &input );
+	virtual void MenuStart( const InputEventPlus &input );
+	virtual void MenuBack( const InputEventPlus &input );
+	virtual void MenuCoin( const InputEventPlus &input );
 
 private:
 	enum View { VIEW_LAST_DAYS, VIEW_LAST_WEEKS, VIEW_DAY_OF_WEEK, VIEW_HOUR_OF_DAY, NUM_VIEWS };
diff --git a/stepmania/src/ScreenNetRoom.cpp b/stepmania/src/ScreenNetRoom.cpp
index fb974977c5..d867f2bfb5 100644
--- a/stepmania/src/ScreenNetRoom.cpp
+++ b/stepmania/src/ScreenNetRoom.cpp
@@ -213,7 +213,7 @@ void ScreenNetRoom::TweenOffScreen()
 	NSMAN->ReportNSSOnOff(6);
 }
 
-void ScreenNetRoom::MenuStart( PlayerNumber pn )
+void ScreenNetRoom::MenuStart( const InputEventPlus &input )
 {
 	m_RoomWheel.Select();
 	RoomWheelData* rwd = (RoomWheelData*)m_RoomWheel.LastSelected(); 
@@ -233,16 +233,16 @@ void ScreenNetRoom::MenuStart( PlayerNumber pn )
 			NSMAN->SendSMOnline( );
 		}
 	}
-	ScreenNetSelectBase::MenuStart( pn );
+	ScreenNetSelectBase::MenuStart( input );
 }
 
-void ScreenNetRoom::MenuBack( PlayerNumber pn )
+void ScreenNetRoom::MenuBack( const InputEventPlus &input )
 {
 	TweenOffScreen();
 
 	Cancel( SM_GoToPrevScreen );
 
-	ScreenNetSelectBase::MenuBack( pn );
+	ScreenNetSelectBase::MenuBack( input );
 }
 
 void ScreenNetRoom::MenuLeft( const InputEventPlus &input )
@@ -250,7 +250,7 @@ void ScreenNetRoom::MenuLeft( const InputEventPlus &input )
 	if( input.type == IET_FIRST_PRESS )
 		m_RoomWheel.Move(-1);
 
-	ScreenNetSelectBase::MenuLeft( input.pn );
+	ScreenNetSelectBase::MenuLeft( input );
 }
 
 void ScreenNetRoom::MenuRight( const InputEventPlus &input )
@@ -258,7 +258,7 @@ void ScreenNetRoom::MenuRight( const InputEventPlus &input )
 	if( input.type == IET_FIRST_PRESS )
 		m_RoomWheel.Move(1);
 
-	ScreenNetSelectBase::MenuRight( input.pn );
+	ScreenNetSelectBase::MenuRight( input );
 }
 
 void ScreenNetRoom::UpdateRoomsList()
diff --git a/stepmania/src/ScreenNetRoom.h b/stepmania/src/ScreenNetRoom.h
index 54331614f1..73d0985e23 100644
--- a/stepmania/src/ScreenNetRoom.h
+++ b/stepmania/src/ScreenNetRoom.h
@@ -34,8 +34,8 @@ public:
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
 protected:
-	virtual void MenuStart( PlayerNumber pn );
-	virtual void MenuBack( PlayerNumber pn );
+	virtual void MenuStart( const InputEventPlus &input );
+	virtual void MenuBack( const InputEventPlus &input );
 
 	virtual void TweenOffScreen( );
 
diff --git a/stepmania/src/ScreenPackages.cpp b/stepmania/src/ScreenPackages.cpp
index 8f2157b37a..f8982b1bd6 100644
--- a/stepmania/src/ScreenPackages.cpp
+++ b/stepmania/src/ScreenPackages.cpp
@@ -153,7 +153,7 @@ void ScreenPackages::Update( float fDeltaTime )
 }
 
 static LocalizedString ENTER_URL ("ScreenPackages","Enter URL");
-void ScreenPackages::MenuStart( PlayerNumber pn )
+void ScreenPackages::MenuStart( const InputEventPlus &input )
 {
 	if ( m_iDLorLST == 1 )
 	{
@@ -162,7 +162,7 @@ void ScreenPackages::MenuStart( PlayerNumber pn )
 		else
 			EnterURL( m_Links[m_iLinksPos] );
 	}
-	ScreenWithMenuElements::MenuStart( pn );
+	ScreenWithMenuElements::MenuStart( input );
 }
 
 void ScreenPackages::MenuUp( const InputEventPlus &input )
@@ -248,7 +248,7 @@ void ScreenPackages::MenuRight( const InputEventPlus &input )
 }
 
 static LocalizedString DOWNLOAD_CANCELLED( "ScreenPackages", "Download cancelled." );
-void ScreenPackages::MenuBack( PlayerNumber pn )
+void ScreenPackages::MenuBack( const InputEventPlus &input )
 {
 	if ( m_bIsDownloading )
 	{
@@ -259,7 +259,7 @@ void ScreenPackages::MenuBack( PlayerNumber pn )
 
 	TweenOffScreen();
 	Cancel( SM_GoToPrevScreen );
-	ScreenWithMenuElements::MenuBack( pn );
+	ScreenWithMenuElements::MenuBack( input );
 }
 
 void ScreenPackages::TweenOffScreen( )
diff --git a/stepmania/src/ScreenPackages.h b/stepmania/src/ScreenPackages.h
index 772edce918..21a266c702 100644
--- a/stepmania/src/ScreenPackages.h
+++ b/stepmania/src/ScreenPackages.h
@@ -16,12 +16,12 @@ public:
 
 	virtual void HandleScreenMessage( const ScreenMessage SM );
 
-	virtual void MenuStart( PlayerNumber pn );
+	virtual void MenuStart( const InputEventPlus &input );
 	virtual void MenuUp( const InputEventPlus &input );
 	virtual void MenuDown( const InputEventPlus &input );
 	virtual void MenuLeft( const InputEventPlus &input );
 	virtual void MenuRight( const InputEventPlus &input );
-	virtual void MenuBack( PlayerNumber pn );
+	virtual void MenuBack( const InputEventPlus &input );
 
 	virtual void TweenOffScreen( );
 	virtual void Update(float f);