diff --git a/buildnumber.txt b/buildnumber.txt
index 8db1e5f1..1fc188de 100644
--- a/buildnumber.txt
+++ b/buildnumber.txt
@@ -1 +1 @@
-522
\ No newline at end of file
+525
\ No newline at end of file
diff --git a/source/funkin/game/NoteGroup.hx b/source/funkin/game/NoteGroup.hx
index d57a85dc..10c54899 100644
--- a/source/funkin/game/NoteGroup.hx
+++ b/source/funkin/game/NoteGroup.hx
@@ -20,6 +20,10 @@ class NoteGroup extends FlxTypedGroup<Note> {
         }
     }
 
+    // public override function sort() {
+
+    // }
+
     public override function draw() {
         @:privateAccess var oldDefaultCameras = FlxCamera._defaultCameras;
 		@:privateAccess if (cameras != null) FlxCamera._defaultCameras = cameras;
diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx
index 79edac59..a47e97e3 100644
--- a/source/funkin/game/PlayState.hx
+++ b/source/funkin/game/PlayState.hx
@@ -849,7 +849,6 @@ class PlayState extends MusicBeatState
 		}
 		else
 		{
-			// Conductor.songPosition = FlxG.sound.music.time;
 			Conductor.songPosition += FlxG.elapsed * 1000;
 
 			if (!paused)
@@ -857,13 +856,9 @@ class PlayState extends MusicBeatState
 				songTime += FlxG.game.ticks - previousFrameTime;
 				previousFrameTime = FlxG.game.ticks;
 
-				// Interpolation type beat
-				if (Conductor.lastSongPos != Conductor.songPosition)
+				if (Math.abs(FlxG.sound.music.time - Conductor.songPosition) > 20)
 				{
-					songTime = (songTime + Conductor.songPosition) / 2;
-					Conductor.lastSongPos = Conductor.songPosition;
-					// Conductor.songPosition += FlxG.elapsed * 1000;
-					// trace('MISSED FRAME');
+					resyncVocals();
 				}
 			}
 
@@ -1411,10 +1406,6 @@ class PlayState extends MusicBeatState
 	{
 		super.stepHit();
 		scripts.call("stepHit", [curStep]);
-		if (FlxG.sound.music.time > Conductor.songPosition + 20 || FlxG.sound.music.time < Conductor.songPosition - 20)
-		{
-			resyncVocals();
-		}
 	}
 
 	public var lightningStrikeBeat:Int = 0;