diff --git a/src/NotesLoaderSM.cpp b/src/NotesLoaderSM.cpp
index f1ab8ec5ad..f937bdf78c 100644
--- a/src/NotesLoaderSM.cpp
+++ b/src/NotesLoaderSM.cpp
@@ -458,7 +458,7 @@ bool SMLoader::LoadFromSMFile( const RString &sPath, Song &out, bool bFromCache
 	}
 
 	out.m_Timing.m_sFile = sPath;
-	LoadTimingFromSMFile( msd, out.m_Timing );
+	LoadTimingFromSMFile( msd, out.m_SongTiming );
 
 	for( unsigned i=0; i<msd.GetNumValues(); i++ )
 	{
diff --git a/src/Song.cpp b/src/Song.cpp
index 23f68f2891..834c4823da 100644
--- a/src/Song.cpp
+++ b/src/Song.cpp
@@ -145,6 +145,18 @@ void Song::AddLyricSegment( LyricSegment seg )
 	m_LyricSegments.push_back( seg );
 }
 
+Steps *Song::CreateSteps()
+{
+	Steps *pSteps = new Steps;
+	InitSteps( pSteps );
+	return pSteps;
+}
+
+void Song::InitSteps(Steps *pSteps)
+{
+	pSteps->m_Timing = m_SongTiming;
+}
+
 void Song::GetDisplayBpms( DisplayBpms &AddTo ) const
 {
 	if( m_DisplayBPMType == DISPLAY_BPM_SPECIFIED )
diff --git a/src/Song.h b/src/Song.h
index 2b6769566f..1d49724795 100644
--- a/src/Song.h
+++ b/src/Song.h
@@ -336,11 +336,15 @@ public:
 	void SetBPMAtBeat( float fBeat, float fBPM ) { m_Timing.SetBPMAtBeat( fBeat, fBPM ); }
 	BPMSegment& GetBPMSegmentAtBeat( float fBeat ) { return m_Timing.GetBPMSegmentAtBeat( fBeat ); }
 */
+	
+	Steps *CreateSteps();
+	void InitSteps(Steps *pSteps);
 
 	/**
 	 * @brief Retrieve the beat based on the specified time.
 	 * @param fElapsedTime the amount of time since the Song started.
 	 * @return the appropriate beat. */
+	/* [splittiming]
 	float SongGetBeatFromElapsedTime( float fElapsedTime ) const 
 	{
 		return m_SongTiming.GetBeatFromElapsedTime( fElapsedTime );
@@ -358,7 +362,7 @@ public:
 	{
 		return steps.m_Timing.GetElapsedTimeFromBeat( fBeat );
 	}
-	
+	*/
 	
 	/* [splittiming]
 	float GetBeatFromElapsedTime( float fElapsedTime ) const