diff --git a/Docs/Luadoc/Lua.xml b/Docs/Luadoc/Lua.xml
index 76476fd88b..a8edb5afde 100644
--- a/Docs/Luadoc/Lua.xml
+++ b/Docs/Luadoc/Lua.xml
@@ -891,7 +891,8 @@
 		</Class>
 		<Class base='WheelBase' name='MusicWheel'>
 			<Function name='IsRouletting'/>
-			<Function name='ResetSelection'/>
+			<Function name='SelectSong'/>
+			<Function name='SelectCourse'/>
 		</Class>
 		<Class base='Actor' name='Model'>
 			<Function name='GetDefaultAnimation'/>
diff --git a/Docs/Luadoc/LuaDocumentation.xml b/Docs/Luadoc/LuaDocumentation.xml
index 6bc7b1e69f..1fb73dd675 100644
--- a/Docs/Luadoc/LuaDocumentation.xml
+++ b/Docs/Luadoc/LuaDocumentation.xml
@@ -2613,8 +2613,11 @@ save yourself some time, copy this for undocumented things:
 	<Function name='IsRouletting' return='bool' arguments=''>
 		Returns <code>true</code> if the MusicWheel is currently handling Roulette selection.
 	</Function>
-	<Function name='ResetSelection' return='bool' arguments=''>
-		Tries to set the MusicWheel's selection based on preferred song, preferred course, and current sort order. Returns <code>false</code> on failure.
+	<Function name='SelectSong' return='bool' arguments='Song sSong'>
+		Selects a song. Returns <code>false</code> on failure.
+	</Function>
+	<Function name='SelectCourse' return='bool' arguments='Course cCourse'>
+		Selects a course. Returns <code>false</code> on failure.
 	</Function>
 </Class> 
 <Class name='NoteSkinManager'>
diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp
index 964f73ae4c..52c15b4e94 100644
--- a/src/MusicWheel.cpp
+++ b/src/MusicWheel.cpp
@@ -1619,12 +1619,25 @@ class LunaMusicWheel: public Luna<MusicWheel>
 {
 public:
 	static int IsRouletting( T* p, lua_State *L ){ lua_pushboolean( L, p->IsRouletting() ); return 1; }
-	static int ResetSelection( T* p, lua_State *L ){ lua_pushboolean( L, p->SelectSongOrCourse() ); return 1; }
+	static int SelectSong( T* p, lua_State *L )
+	{
+		if( lua_isnil(L,1) ) { lua_pushboolean( L, false ); return 1; }
+		else { Song *pS = Luna<Song>::check( L, 1, true ); lua_pushboolean( L, p->SelectSong( pS ) ); }
+		return 1;
+	}
+	static int SelectCourse( T* p, lua_State *L )
+	{
+		if( lua_isnil(L,1) ) { lua_pushboolean( L, false ); return 1; }
+		else { Course *pC = Luna<Course>::check( L, 1, true ); lua_pushboolean( L, p->SelectSong( pC ) ); }
+		return 1;
+	}
+
 
 	LunaMusicWheel()
 	{
 		ADD_METHOD( IsRouletting );
-		ADD_METHOD( ResetSelection );
+		ADD_METHOD( SelectSong );
+		ADD_METHOD( SelectCourse );
 	}
 };