diff --git a/source/KadeEngineData.hx b/source/KadeEngineData.hx
index fc127e7337..4d00c7c72c 100644
--- a/source/KadeEngineData.hx
+++ b/source/KadeEngineData.hx
@@ -24,5 +24,8 @@ class KadeEngineData
 
         if (FlxG.save.data.songPosition == null)
             FlxG.save.data.songPosition = false;
+
+		if (FlxG.save.data.etternaMode == null)
+            FlxG.save.data.etternaMode = false;
     }
 }
\ No newline at end of file
diff --git a/source/OptionsMenu.hx b/source/OptionsMenu.hx
index 00bb7798c6..68ee6e73af 100644
--- a/source/OptionsMenu.hx
+++ b/source/OptionsMenu.hx
@@ -31,6 +31,7 @@ class OptionsMenu extends MusicBeatState
 			"\n" + (FlxG.save.data.downscroll ? 'Downscroll' : 'Upscroll') + 
 			"\nAccuracy " + (!FlxG.save.data.accuracyDisplay ? "off" : "on") + 
 			"\nSong Position " + (!FlxG.save.data.songPosition ? "off" : "on") +
+			"\nEtterna Mode " + (!FlxG.save.data.etternaMode ? "off" : "on") +
 			"\nLoad replays");
 		
 		trace(controlsStrings);
@@ -89,7 +90,7 @@ class OptionsMenu extends MusicBeatState
 
 			if (controls.ACCEPT)
 			{
-				if (curSelected != 5)
+				if (curSelected != 6)
 					grpControls.remove(grpControls.members[curSelected]);
 				switch(curSelected)
 				{
@@ -129,6 +130,12 @@ class OptionsMenu extends MusicBeatState
 						ctrl.targetY = curSelected - 4;
 						grpControls.add(ctrl);
 					case 5:
+						FlxG.save.data.etternaMode = !FlxG.save.data.etternaMode;
+						var ctrl:Alphabet = new Alphabet(0, (70 * curSelected) + 30, "Etterna Mode " + (!FlxG.save.data.etternaMode ? "off" : "on"), true, false);
+						ctrl.isMenuItem = true;
+						ctrl.targetY = curSelected - 5;
+						grpControls.add(ctrl);
+					case 6:
 						trace('switch');
 						FlxG.switchState(new LoadReplayState());
 				}
diff --git a/source/PlayState.hx b/source/PlayState.hx
index 4cde2344ab..c7f8bfa558 100644
--- a/source/PlayState.hx
+++ b/source/PlayState.hx
@@ -166,6 +166,12 @@ class PlayState extends MusicBeatState
 	override public function create()
 	{
 
+		if (FlxG.save.data.etternaMode)
+			Conductor.safeFrames = 7; // 116ms hit window (j3-4)
+		else
+			Conductor.safeFrames = 10; // 166ms hit window (j1)
+
+
 		theFunne = FlxG.save.data.newInput;
 		if (FlxG.sound.music != null)
 			FlxG.sound.music.stop();
@@ -1472,7 +1478,7 @@ class PlayState extends MusicBeatState
 			ranking = "(SDCB)";
 		else if (misses == 0 && (shits >= 10 || bads >= 10)) // Regular FC
 			ranking = "(FC)";
-		else if (misses >= 1) // Combo Broken
+		else if (misses >= 1 || (shits >= 10 || bads >= 10)) // Combo Breaks
 			ranking = "(CB)";
 
 		// WIFE TIME :)))) (based on Wife3)
@@ -2085,7 +2091,7 @@ class PlayState extends MusicBeatState
 					ss = false;
 					goods++;
 				}
-				else if (noteDiff > Conductor.safeZoneOffset * 0.25)
+				else if (noteDiff > Conductor.safeZoneOffset * 0.35)
 				{
 					daRating = 'good';
 					totalNotesHit += 0.65 - wife;
diff --git a/version.downloadMe b/version.downloadMe
index d2d61a7e8e..a58941b07a 100644
--- a/version.downloadMe
+++ b/version.downloadMe
@@ -1 +1 @@
-1.2.2
\ No newline at end of file
+1.3
\ No newline at end of file