diff --git a/Assets/Scripts/Managers/DataManager.cs b/Assets/Scripts/Managers/DataManager.cs
index 5e8fa4067826e79f5f33acb630f37d38c3845119..a7c9ebfcbf9293d61e8cbef41d565a37e0b6ffcd 100644
--- a/Assets/Scripts/Managers/DataManager.cs
+++ b/Assets/Scripts/Managers/DataManager.cs
@@ -16,9 +16,9 @@ public static class DataManager
 
         BinaryFormatter formatter = new BinaryFormatter();
         if (GAMEMODE == "ZEN") {
-            path = Application.persistentDataPath + "/zen/" + unixTime + ".fun";
+            path = Application.persistentDataPath + "/zen_" + unixTime;
         } else {
-            path = Application.persistentDataPath + "/waves/" + unixTime + ".fun";
+            path = Application.persistentDataPath + "/wave_" + unixTime;
         }
         FileStream stream = new FileStream(path, FileMode.Create);
 
@@ -26,6 +26,7 @@ public static class DataManager
 
         formatter.Serialize(stream, data);
         stream.Close();
+        Debug.Log(path);
     }
 
     public static PlayerData LoadPlayer(string GAMEMODE) {
@@ -35,9 +36,9 @@ public static class DataManager
         string unixTime = ((DateTimeOffset)timestamp).ToUnixTimeSeconds().ToString();
 
         if (GAMEMODE == "ZEN") {
-            path = Application.persistentDataPath + "/zen/" + unixTime + ".fun";
+            path = Application.persistentDataPath + "/zen_" + unixTime;
         } else {
-            path = Application.persistentDataPath + "/waves/" + unixTime + ".fun";
+            path = Application.persistentDataPath + "/wave_" + unixTime;
         }
 
         if (File.Exists(path)) {
diff --git a/Assets/Scripts/Managers/GameOverManager.cs b/Assets/Scripts/Managers/GameOverManager.cs
index 77f3de464da811da42dc8d1690f4a5fc64e07d0f..f2e0ff185bef4eeeaf017c317b23c5b9f624a28d 100644
--- a/Assets/Scripts/Managers/GameOverManager.cs
+++ b/Assets/Scripts/Managers/GameOverManager.cs
@@ -26,6 +26,7 @@ public class GameOverManager : MonoBehaviour
         {
             anim.SetBool("GameOver", true);
             isGameOver = true;
+            ScoreManager.isScoreOver = true;
 
             if (!isSaved) {
                 DataManager.SaveData("dummy1", ScoreManager.finalScore, "ZEN");
diff --git a/Assets/Scripts/Managers/ScoreManager.cs b/Assets/Scripts/Managers/ScoreManager.cs
index 9a888b420cf065b527cbc832c229d20321a6773f..ffdad00bf2a82f39dcf53838eb81e3afdc36929c 100644
--- a/Assets/Scripts/Managers/ScoreManager.cs
+++ b/Assets/Scripts/Managers/ScoreManager.cs
@@ -8,6 +8,7 @@ public class ScoreManager : MonoBehaviour
     public static float score;
     public static int finalScore;
     int multiplier = 1;
+    public static bool isScoreOver = false;
 
 
     Text text;
@@ -21,9 +22,14 @@ public class ScoreManager : MonoBehaviour
 
     void Update ()
     {
-        score += Time.deltaTime * multiplier;
-        finalScore = (int) score;
-        text.text = "Score: " + String.Format("{0:0}",score);
+        if (!isScoreOver) {
+            score += Time.deltaTime * multiplier;
+            finalScore = (int) score;
+            text.text = "Score: " + String.Format("{0:0}",score);
+        } else {
+            text.text = "Score: " + String.Format("{0:0}",score);
+        }
+        
     }