diff --git a/Assets/Scenes/GameOver.unity b/Assets/Scenes/GameOver.unity
index f3b5844..a165835 100644
Binary files a/Assets/Scenes/GameOver.unity and b/Assets/Scenes/GameOver.unity differ
diff --git a/Assets/Scripts/GameOver.cs b/Assets/Scripts/GameOver.cs
index 6052d20..100b0d5 100644
--- a/Assets/Scripts/GameOver.cs
+++ b/Assets/Scripts/GameOver.cs
@@ -8,18 +8,17 @@ using Assets.Scripts.API;
 public class GameOver : MonoBehaviour
 {
     private float _timer = 0f;
-	private int score;
+	private int score = 0;
 
-	private Player _player;
+	private GameObject _player;
 	public InputField PlayerName;
 	public InputField TeamName;
 	public Text Score;
+	public Button buttonSubmit;
+	public Button buttonPlay;
 
     void Start()
     {
-		_player = GameObject.FindWithTag("Player").GetComponent<Player>();
-		score = _player.Score;
-		Score.text = "You scored " + score;
     }
 	
 	void Update ()
@@ -27,6 +26,8 @@ public class GameOver : MonoBehaviour
 //	    _timer += Time.deltaTime;
 //        if (_timer > 4f)
 //            SceneManager.LoadScene("Menu");
+		score = PlayerPrefs.GetInt("lastscore");
+		Score.text = "You scored " + score;
 	}
 
 	public void OnButtonPlayClicked()
@@ -40,7 +41,7 @@ public class GameOver : MonoBehaviour
 		if (playerText == null || playerText.Length == 0) {
 			playerText = "Random Randy";
 		}
-		string teamText = PlayerName.text;
+		string teamText = TeamName.text;
 		if (teamText == null || teamText.Length == 0) {
 			teamText = null;
 		}
diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs
index 62779a9..233bf30 100644
--- a/Assets/Scripts/Player.cs
+++ b/Assets/Scripts/Player.cs
@@ -34,6 +34,7 @@ namespace Assets.Scripts
             {
                 if (PlayerPrefs.GetInt("highscore") < Score)
                     PlayerPrefs.SetInt("highscore", Score);
+				PlayerPrefs.SetInt("lastscore", Score);
 				SceneManager.LoadScene("GameOver");
 
             }