diff --git a/src/itdelatrisu/opsu/GameImage.java b/src/itdelatrisu/opsu/GameImage.java
index 396f76e8..dfe9744f 100644
--- a/src/itdelatrisu/opsu/GameImage.java
+++ b/src/itdelatrisu/opsu/GameImage.java
@@ -277,6 +277,12 @@ public enum GameImage {
 			return img.getScaledCopy(0.8f);
 		}
 	},
+	MENU_LOGO_PIECE ("logo2piece2", "png", false, true) {
+		@Override
+		protected Image process_sub(Image img, int w, int h) {
+			return img.getScaledCopy(0.8f);
+		}
+	},
 	MENU_PLAY ("menu-play", "png", false, false) {
 		@Override
 		protected Image process_sub(Image img, int w, int h) {
diff --git a/src/itdelatrisu/opsu/states/MainMenu.java b/src/itdelatrisu/opsu/states/MainMenu.java
index f90d1de1..ebfe7932 100644
--- a/src/itdelatrisu/opsu/states/MainMenu.java
+++ b/src/itdelatrisu/opsu/states/MainMenu.java
@@ -272,8 +272,10 @@ public class MainMenu extends BasicGameState {
 		}
 
 		float scale = 1f;
+		double position = 0;
 
 		if (MusicController.isPlaying() && MusicController.getBeatmap() != null) {
+			int trackposition = MusicController.getPosition();
 			Beatmap map = MusicController.getBeatmap();
 			TimingPoint p = null;
 			if (map.timingPoints != null) {
@@ -284,7 +286,7 @@ public class MainMenu extends BasicGameState {
 					if (p == null || pts.getTime() < MusicController.getPosition()) {
 						i++;
 						p = pts;
-						if (!p.isInherited()) {
+						if (!p.isInherited() && p.getBeatLength() > 0) {
 							beatlen = p.getBeatLength();
 							time = p.getTime();
 						}
@@ -293,14 +295,25 @@ public class MainMenu extends BasicGameState {
 				System.out.println(i);
 				if (p != null) {
 					double beatLength = beatlen * 100;
-					int realtime = MusicController.getPosition() * 100;
-					scale -= (0 - (((realtime - time * 100) % beatLength) / beatLength)) * 0.05;
+					int realtime = trackposition * 100;
+					position = (((realtime/* - time * 100 idk.. */) % beatLength) / beatLength);
+					scale -= (0 - position) * 0.05;
 				}
 			}
 		}
 
+		//scale = 1f;
 		logo.draw(Color.white, scale);
 
+		Image piece = GameImage.MENU_LOGO_PIECE.getImage();
+		float xRadius = piece.getWidth() / 2;
+		float yRadius = piece.getHeight() / 2;
+		piece = piece.getScaledCopy(scale);
+		float scaleposmodx = piece.getWidth() / 2 - xRadius;
+		float scaleposmody = piece.getHeight() / 2 - yRadius;
+		piece.rotate((float)(position * 360));
+		piece.draw(logo.getX() - xRadius - scaleposmodx, logo.getY() - yRadius - scaleposmody);
+
 		// draw music buttons
 		if (MusicController.isPlaying())
 			musicPause.draw();