diff --git a/source/Note.hx b/source/Note.hx
index ad8be4920..4b6f0c1f3 100644
--- a/source/Note.hx
+++ b/source/Note.hx
@@ -34,7 +34,6 @@ class Note extends FlxSprite
 
 	public var invisNote:Bool = false;
 
-	public var sustainLength:Float = 0;
 	public var isSustainNote:Bool = false;
 
 	public var colorSwap:ColorSwap;
diff --git a/source/charting/ChartingState.hx b/source/charting/ChartingState.hx
index fdbf5a39f..92d9434ee 100644
--- a/source/charting/ChartingState.hx
+++ b/source/charting/ChartingState.hx
@@ -1261,7 +1261,7 @@ class ChartingState extends MusicBeatState
 		// trace('bullshit $bullshit'); // trace(Math.floor(dummyArrow.y / GRID_SIZE) * GRID_SIZE);
 
 		var daNewNote:Note = new Note(noteStrum, noteData);
-		daNewNote.sustainLength = noteSus;
+		daNewNote.data.sustainLength = noteSus;
 		daNewNote.data.altNote = noteAlt;
 		SongLoad.getSong()[curSection].sectionNotes.push(daNewNote.data);
 
@@ -1341,7 +1341,7 @@ class ChartingState extends MusicBeatState
 
 	function loadAutosave():Void
 	{
-		PlayState.SONG = SongLoad.parseJSONshit(FlxG.save.data.autosave);
+		PlayState.SONG = FlxG.save.data.autosave;
 		FlxG.resetState();
 	}