diff --git a/source/Note.hx b/source/Note.hx
index d591bbe..472dbd2 100644
--- a/source/Note.hx
+++ b/source/Note.hx
@@ -178,6 +178,8 @@ class Note extends FlxSprite
 		if (FlxG.save.data.downscroll && sustainNote) 
 			flipY = true;
 
+		var stepHeight = (0.45 * Conductor.stepCrochet * FlxMath.roundDecimal(PlayStateChangeables.scrollSpeed == 1 ? PlayState.SONG.speed : PlayStateChangeables.scrollSpeed, 2));
+
 		if (isSustainNote && prevNote != null)
 		{
 			noteScore * 0.2;
@@ -202,19 +204,13 @@ class Note extends FlxSprite
 				prevNote.animation.play(dataColor[prevNote.originColor] + 'hold');
 				prevNote.updateHitbox();
 
-				prevNote.noteYOff = 0;
-				prevNote.scale.y *= (0.45 * Conductor.stepCrochet * FlxMath.roundDecimal(PlayStateChangeables.scrollSpeed == 1 ? PlayState.SONG.speed : PlayStateChangeables.scrollSpeed, 2)) / prevNote.height * 1.01; //The 1.01 is so that there aren't odd 1 pixel gaps as the notes scroll
+				prevNote.scale.y *= (stepHeight + 1) / prevNote.height; // + 1 so that there's no odd gaps as the notes scroll
 				prevNote.updateHitbox();
+				prevNote.noteYOff = Math.round(-prevNote.offset.y);
 
 				// prevNote.setGraphicSize();
 
-				switch (noteTypeCheck)
-				{
-					case 'pixel':
-						noteYOff = -13;
-					default:
-						noteYOff = -23;
-				}
+				noteYOff = Math.round(-offset.y);
 			}
 		}
 	}
diff --git a/source/PlayState.hx b/source/PlayState.hx
index b985df0..5192b16 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -2825,9 +2825,9 @@ class PlayState extends MusicBeatState
 
 				if (daNote.isSustainNote)
 				{
-					daNote.x += daNote.width / 2 + 17;
+					daNote.x += daNote.width / 2 + 20;
 					if (PlayState.curStage.startsWith('school'))
-						daNote.x -= 8;
+						daNote.x -= 11;
 				}
 
 				// trace(daNote.y);