diff --git a/source/PlayState.hx b/source/PlayState.hx
index b19a3d1..be43c79 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -188,8 +188,6 @@ class PlayState extends MusicBeatState
 
 	var notesHitArray:Array<Date> = [];
 	var currentFrames:Int = 0;
-	var idleToBeat:Bool = true; // change if bf and dad would idle to the beat of the song
-	var idleBeat:Int = 4; // how frequently bf and dad would play their idle animation(1 - every beat, 2 - every 2 beats and so on)
 
 	public var dialogue:Array<String> = ['dad:blah blah blah', 'bf:coolswag'];
 
@@ -3986,7 +3984,7 @@ class PlayState extends MusicBeatState
 		FlxG.stage.window.onFocusIn.add(focusIn);
 
 		var ourSource:String = "assets/videos/daWeirdVid/dontDelete.webm";
-		WebmPlayer.SKIP_STEP_LIMIT = 90;
+		//WebmPlayer.SKIP_STEP_LIMIT = 90;
 		var str1:String = "WEBM SHIT";
 		webmHandler = new WebmHandler();
 		webmHandler.source(ourSource);
@@ -4464,11 +4462,40 @@ class PlayState extends MusicBeatState
 		{
 			// else
 			// Conductor.changeBPM(SONG.bpm);
-
+	
 			// Dad doesnt interupt his own notes
-			if ((SONG.notes[Math.floor(curStep / 16)].mustHitSection || !dad.animation.curAnim.name.startsWith("sing")) && dad.curCharacter != 'gf')
-				if (curBeat % idleBeat == 0 || dad.curCharacter == "spooky")
-					dad.dance(idleToBeat);
+			if (SONG.notes[Math.floor(curStep / 16)].mustHitSection && (dad.curCharacter != 'gf' || dad.curCharacter != 'spooky' || dad.curCharacter != 'tankman')) 
+				dad.dance();
+			//SPOOKY BOIS AND GF FIX
+			switch (dad.curCharacter) {
+				case 'spooky':
+					var commandToDance = false;
+					var commandCompleted = false;
+					if (SONG.notes[Math.floor(curStep / 16)].mustHitSection)
+					{
+						commandToDance = true;
+						commandCompleted = false;
+					}
+						
+					if (commandToDance && !commandCompleted)
+					{
+						dad.dance();
+						commandToDance = false;
+						commandCompleted = true;
+					}
+				case 'gf':
+				{
+					if (SONG.notes[Math.floor(curStep / 16)].mustHitSection)
+						dad.dance();
+					else
+					{
+						if (curBeat == 73 || curBeat % 4 == 0 || curBeat % 4 == 1)
+							dad.playAnim('danceLeft', true);
+						else
+							dad.playAnim('danceRight', true);
+					}
+				}
+			}
 		}
 		// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
 		wiggleShit.update(Conductor.crochet);
@@ -4500,9 +4527,9 @@ class PlayState extends MusicBeatState
 			gf.dance();
 		}
 
-		if (!boyfriend.animation.curAnim.name.startsWith("sing") && curBeat % idleBeat == 0)
+		if (!boyfriend.animation.curAnim.name.startsWith("sing"))
 		{
-			boyfriend.playAnim('idle', idleToBeat);
+			boyfriend.playAnim('idle');
 		}
 
 		/*if (!dad.animation.curAnim.name.startsWith("sing"))