diff --git a/stepmania/src/Notes.cpp b/stepmania/src/Notes.cpp
index bda24256b6..48269a448d 100644
--- a/stepmania/src/Notes.cpp
+++ b/stepmania/src/Notes.cpp
@@ -269,14 +269,7 @@ void Notes::BakeAutoGen()
 {
 	NoteData noteData;
 	parent->GetNoteData( &noteData );
-	this->SetNoteData( &noteData );
-	this->SetDescription( "AutoGen'd from "+parent->GetDescription() );
-	this->SetDifficulty( parent->GetDifficulty() );
-	this->SetMeter( parent->GetMeter() );
-
-	const float* radarValues = parent->GetRadarValues();
-	for( int r=0; r<NUM_RADAR_CATEGORIES; r++ )
-		this->SetRadarValue( (RadarCategory)r, radarValues[r] );
+	this->SetNoteData( &noteData );		// this will call DeAutoGen
 
 	parent = NULL;
 }
diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index a3cfb73a4c..76ba269eb4 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -201,11 +201,12 @@ void ScreenEditMenu::MenuStart( PlayerNumber pn )
 			// Yuck.  Doing the memory allocation doesn't seem right since
 			// Song allocates all of the other Notes.
 			Notes* pNewNotes = new Notes;
-			pNewNotes->CopyFrom( pSourceNotes, nt );
+			pNewNotes->AutogenFrom( pSourceNotes, nt );
+			pNewNotes->BakeAutoGen();
 			pNewNotes->SetDifficulty( dc );
 			pSong->AddNotes( pNewNotes );
 		
-			SCREENMAN->SystemMessage( "AutoGen Notes created." );
+			SCREENMAN->SystemMessage( "Notes created from AutoGen." );
 			m_soundCreate.PlayRandom();
 			m_Selector.Refresh();
 			pSong->Save();