diff --git a/stepmania/src/ScreenCaution.cpp b/stepmania/src/ScreenCaution.cpp
index adbdd7ceb7..2d18f176af 100644
--- a/stepmania/src/ScreenCaution.cpp
+++ b/stepmania/src/ScreenCaution.cpp
@@ -49,7 +49,7 @@ ScreenCaution::ScreenCaution()
 
 	this->SendScreenMessage( SM_StartClosing, 3 );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","caution music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","caution music") );
 }
 
 
diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index 0ba8e7f83b..9e9ca75052 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -62,7 +62,7 @@ ScreenEditMenu::ScreenEditMenu()
 	m_Fade.SetOpened();
 	this->AddChild( &m_Fade);
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","edit menu music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","edit menu music") );
 
 	m_soundSelect.Load( THEME->GetPathTo("Sounds","menu start") );
 
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index f186c19783..df1cf03fbb 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -625,7 +625,7 @@ ScreenEvaluation::ScreenEvaluation( bool bSummary )
 	else
 		m_Menu.TweenOnScreenFromBlack( SM_None );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","evaluation music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","evaluation music") );
 }
 
 
diff --git a/stepmania/src/ScreenEz2SelectPlayer.cpp b/stepmania/src/ScreenEz2SelectPlayer.cpp
index d6345e3a0c..248a6adb4d 100644
--- a/stepmania/src/ScreenEz2SelectPlayer.cpp
+++ b/stepmania/src/ScreenEz2SelectPlayer.cpp
@@ -102,7 +102,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer()
 
 	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select player intro") );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select player music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select player music") );
 
 	TweenOnScreen();
 	m_Menu.TweenOnScreenFromBlack( SM_None );
diff --git a/stepmania/src/ScreenGameOver.cpp b/stepmania/src/ScreenGameOver.cpp
index a3333f213b..a8e8fa2817 100644
--- a/stepmania/src/ScreenGameOver.cpp
+++ b/stepmania/src/ScreenGameOver.cpp
@@ -36,7 +36,7 @@ ScreenGameOver::ScreenGameOver()
 	m_Fade.OpenWipingRight( SM_None );
 	this->AddChild( &m_Fade );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","game over music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","game over music") );
 
 	this->SendScreenMessage( SM_PlayAnnouncer, 0.5 );
 	this->SendScreenMessage( SM_StartFadingOut, 5 );
diff --git a/stepmania/src/ScreenGraphicOptions.cpp b/stepmania/src/ScreenGraphicOptions.cpp
index 002174823f..f1f2b819c3 100644
--- a/stepmania/src/ScreenGraphicOptions.cpp
+++ b/stepmania/src/ScreenGraphicOptions.cpp
@@ -84,7 +84,7 @@ ScreenGraphicOptions::ScreenGraphicOptions() :
 	UpdateRefreshRates();
 	m_Menu.StopTimer();
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","graphic options music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","graphic options music") );
 }
 
 
diff --git a/stepmania/src/ScreenHowToPlay.cpp b/stepmania/src/ScreenHowToPlay.cpp
index ed743050d4..b63715f89d 100644
--- a/stepmania/src/ScreenHowToPlay.cpp
+++ b/stepmania/src/ScreenHowToPlay.cpp
@@ -77,7 +77,7 @@ ScreenHowToPlay::ScreenHowToPlay()
 	m_sprHowToPlay.BeginTweening( 0.6f, Actor::TWEEN_BIAS_BEGIN );
 	m_sprHowToPlay.SetTweenX( CENTER_X );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","how to play music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","how to play music") );
 }
 
 ScreenHowToPlay::~ScreenHowToPlay()
diff --git a/stepmania/src/ScreenInputOptions.cpp b/stepmania/src/ScreenInputOptions.cpp
index 5ef81d5669..a4db42a375 100644
--- a/stepmania/src/ScreenInputOptions.cpp
+++ b/stepmania/src/ScreenInputOptions.cpp
@@ -67,7 +67,7 @@ ScreenInputOptions::ScreenInputOptions() :
 		false );
 	m_Menu.StopTimer();
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","input options music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","input options music") );
 }
 
 void ScreenInputOptions::ImportOptions()
diff --git a/stepmania/src/ScreenMachineOptions.cpp b/stepmania/src/ScreenMachineOptions.cpp
index 3005b75c55..cc63b90d14 100644
--- a/stepmania/src/ScreenMachineOptions.cpp
+++ b/stepmania/src/ScreenMachineOptions.cpp
@@ -70,7 +70,7 @@ ScreenMachineOptions::ScreenMachineOptions() :
 		false );
 	m_Menu.StopTimer();
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","machine options music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","machine options music") );
 }
 
 void ScreenMachineOptions::ImportOptions()
diff --git a/stepmania/src/ScreenMapControllers.cpp b/stepmania/src/ScreenMapControllers.cpp
index cafaca667f..39b00d6910 100644
--- a/stepmania/src/ScreenMapControllers.cpp
+++ b/stepmania/src/ScreenMapControllers.cpp
@@ -102,7 +102,7 @@ ScreenMapControllers::ScreenMapControllers()
 	m_Menu.TweenOnScreenFromBlack( SM_None );
 	this->AddChild( &m_Menu );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","map controllers music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","map controllers music") );
 
 	Refresh();
 }
diff --git a/stepmania/src/ScreenMusicScroll.cpp b/stepmania/src/ScreenMusicScroll.cpp
index 73c995f4e8..dfdca29b07 100644
--- a/stepmania/src/ScreenMusicScroll.cpp
+++ b/stepmania/src/ScreenMusicScroll.cpp
@@ -188,7 +188,7 @@ ScreenMusicScroll::ScreenMusicScroll()
 
 	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("music scroll") );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","music scroll music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","music scroll music") );
 
 	m_Fade.OpenWipingRight();
 }
diff --git a/stepmania/src/ScreenNetworkWaiting.cpp b/stepmania/src/ScreenNetworkWaiting.cpp
index ae1fd14419..ff23bc99a7 100644
--- a/stepmania/src/ScreenNetworkWaiting.cpp
+++ b/stepmania/src/ScreenNetworkWaiting.cpp
@@ -91,7 +91,7 @@ ScreenNetworkWaiting::ScreenNetworkWaiting()
 	m_textPlayerList.SetXY( PLAYER_LIST_X, PLAYER_LIST_Y );
 	this->AddChild( &m_textPlayerList );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","network waiting music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","network waiting music") );
 
 	m_Menu.TweenOnScreenFromBlack( SM_None );
 
diff --git a/stepmania/src/ScreenSandbox.cpp b/stepmania/src/ScreenSandbox.cpp
index 5e4571b51d..5f3cad7603 100644
--- a/stepmania/src/ScreenSandbox.cpp
+++ b/stepmania/src/ScreenSandbox.cpp
@@ -78,7 +78,7 @@ MUSIC->Stop();
 //s[0].s.SetStartSeconds(45);
 //s[0].s.SetPositionSeconds();
 // s[4].s.SetLengthSeconds(1);
-//s[0].s.SetPlaybackRate(.9);
+s[0].s.SetPlaybackRate(1.20);
 //s[0].s.SetStopMode(RageSound::M_LOOP);
 //s[0].s.Play();
 
diff --git a/stepmania/src/ScreenSelectCourse.cpp b/stepmania/src/ScreenSelectCourse.cpp
index ddf590ccac..458d7df0d2 100644
--- a/stepmania/src/ScreenSelectCourse.cpp
+++ b/stepmania/src/ScreenSelectCourse.cpp
@@ -62,7 +62,7 @@ ScreenSelectCourse::ScreenSelectCourse()
 {
 	LOG->Trace( "ScreenSelectCourse::ScreenSelectCourse()" );
  
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select course music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select course music") );
 
 	m_bMadeChoice = false;
 	m_bGoToOptions = false;
@@ -132,7 +132,7 @@ ScreenSelectCourse::ScreenSelectCourse()
 
 	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select course intro") );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select course music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select course music") );
 
 	UpdateOptionsDisplays();
 
diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp
index 81c24c32ab..31ace34345 100644
--- a/stepmania/src/ScreenSelectDifficulty.cpp
+++ b/stepmania/src/ScreenSelectDifficulty.cpp
@@ -176,7 +176,7 @@ ScreenSelectDifficulty::ScreenSelectDifficulty()
 	m_Menu.TweenOnScreenFromMenu( SM_None );
 	TweenOnScreen();
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select difficulty music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select difficulty music") );
 
 	m_fLockInputTime = LOCK_INPUT_TIME;
 }
diff --git a/stepmania/src/ScreenSelectGame.cpp b/stepmania/src/ScreenSelectGame.cpp
index b927f2f083..3d44190007 100644
--- a/stepmania/src/ScreenSelectGame.cpp
+++ b/stepmania/src/ScreenSelectGame.cpp
@@ -62,7 +62,7 @@ ScreenSelectGame::ScreenSelectGame() :
 	m_Menu.SetTimer( 99 );
 	m_Menu.StopTimer();
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select game music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select game music") );
 }
 
 void ScreenSelectGame::ImportOptions()
diff --git a/stepmania/src/ScreenSelectGroup.cpp b/stepmania/src/ScreenSelectGroup.cpp
index 82eec501db..a45beb9ca8 100644
--- a/stepmania/src/ScreenSelectGroup.cpp
+++ b/stepmania/src/ScreenSelectGroup.cpp
@@ -167,7 +167,7 @@ ScreenSelectGroup::ScreenSelectGroup()
 
 	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select group intro") );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select group music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select group music") );
 
 	m_Menu.TweenOnScreenFromMenu( SM_None );
 	TweenOnScreen();
diff --git a/stepmania/src/ScreenSelectMode.cpp b/stepmania/src/ScreenSelectMode.cpp
index a8ad83650a..a8d62a11b4 100644
--- a/stepmania/src/ScreenSelectMode.cpp
+++ b/stepmania/src/ScreenSelectMode.cpp
@@ -126,7 +126,7 @@ ScreenSelectMode::ScreenSelectMode()
 
 	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style intro") );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select style music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") );
 
 	RefreshModeChoices();
 
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index 9c6ee609af..ebd9715149 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -807,7 +807,7 @@ void ScreenSelectMusic::PlayMusicSample()
 			pSong->m_fMusicSampleLengthSeconds);
 	}
 //	else
-//		MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select music music") );
+//		SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select music music") );
 }
 
 void ScreenSelectMusic::UpdateOptionsDisplays()
diff --git a/stepmania/src/ScreenSelectStyle.cpp b/stepmania/src/ScreenSelectStyle.cpp
index 2499936fc2..b178fd53e8 100644
--- a/stepmania/src/ScreenSelectStyle.cpp
+++ b/stepmania/src/ScreenSelectStyle.cpp
@@ -103,7 +103,7 @@ ScreenSelectStyle::ScreenSelectStyle()
 
 	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style intro") );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select style music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") );
 
 	AfterChange();
 	TweenOnScreen();
diff --git a/stepmania/src/ScreenSelectStyle5th.cpp b/stepmania/src/ScreenSelectStyle5th.cpp
index f0ee256ced..b9aea08ed8 100644
--- a/stepmania/src/ScreenSelectStyle5th.cpp
+++ b/stepmania/src/ScreenSelectStyle5th.cpp
@@ -178,7 +178,7 @@ ScreenSelectStyle5th::ScreenSelectStyle5th()
 
 	SOUND->PlayOnceStreamedFromDir( ANNOUNCER->GetPathTo("select style intro") );
 
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","select style music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","select style music") );
 
 	m_soundChange.PlayRandom();
 	TweenOnScreen();
diff --git a/stepmania/src/ScreenTitleMenu.cpp b/stepmania/src/ScreenTitleMenu.cpp
index e8087358b4..ed5e53c04f 100644
--- a/stepmania/src/ScreenTitleMenu.cpp
+++ b/stepmania/src/ScreenTitleMenu.cpp
@@ -170,7 +170,7 @@ ScreenTitleMenu::ScreenTitleMenu()
 		LoseFocus( i );
 	GainFocus( m_TitleMenuChoice );
 	
-	MUSIC->LoadAndPlayIfNotAlready( THEME->GetPathTo("Sounds","title menu music") );
+	SOUNDMAN->PlayMusic( THEME->GetPathTo("Sounds","title menu music") );
 
 	this->SendScreenMessage( SM_PlayAttract, SECONDS_BETWEEN_ATTRACT );
 	this->SendScreenMessage( SM_FadeToDemonstration, SECONDS_BEFORE_DEMONSTRATION );