diff --git a/bin/Tetris.apk b/bin/Tetris.apk
index c907895..2c6f07e 100644
Binary files a/bin/Tetris.apk and b/bin/Tetris.apk differ
diff --git a/bin/classes.dex b/bin/classes.dex
index 4d793ad..55fba63 100644
Binary files a/bin/classes.dex and b/bin/classes.dex differ
diff --git a/bin/classes/mangavalk/tetris/CanvasView$1.class b/bin/classes/mangavalk/tetris/CanvasView$1.class
index 9ce8dd6..70636bf 100644
Binary files a/bin/classes/mangavalk/tetris/CanvasView$1.class and b/bin/classes/mangavalk/tetris/CanvasView$1.class differ
diff --git a/bin/classes/mangavalk/tetris/CanvasView$2.class b/bin/classes/mangavalk/tetris/CanvasView$2.class
index 2efaea8..763454b 100644
Binary files a/bin/classes/mangavalk/tetris/CanvasView$2.class and b/bin/classes/mangavalk/tetris/CanvasView$2.class differ
diff --git a/bin/classes/mangavalk/tetris/CanvasView.class b/bin/classes/mangavalk/tetris/CanvasView.class
index 65f37f2..c1c2872 100644
Binary files a/bin/classes/mangavalk/tetris/CanvasView.class and b/bin/classes/mangavalk/tetris/CanvasView.class differ
diff --git a/bin/dexedLibs/google-play-services_lib-0f09ee896a674b9292f9df3250c11de4.jar b/bin/dexedLibs/google-play-services_lib-0f09ee896a674b9292f9df3250c11de4.jar
index 9097cc0..5061c21 100644
Binary files a/bin/dexedLibs/google-play-services_lib-0f09ee896a674b9292f9df3250c11de4.jar and b/bin/dexedLibs/google-play-services_lib-0f09ee896a674b9292f9df3250c11de4.jar differ
diff --git a/bin/resources.ap_ b/bin/resources.ap_
index 34566ca..b49b2fa 100644
Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ
diff --git a/src/mangavalk/tetris/CanvasView.java b/src/mangavalk/tetris/CanvasView.java
index a98916e..e973dfb 100644
--- a/src/mangavalk/tetris/CanvasView.java
+++ b/src/mangavalk/tetris/CanvasView.java
@@ -21,7 +21,7 @@ import java.util.TimerTask;
 
 public class CanvasView extends View
 {
-    //region variabelen
+    // Variabelen
     Resources r;
 
     //  Sizes
@@ -281,17 +281,28 @@ public class CanvasView extends View
 
     Bitmap Font0, Font1, Font2, Font3, Font4, Font5, Font6, Font7, Font8, Font9;
 
-
+    //  Score.
     public int startLevel = 0;
     int level = 0;
 
     int lines = 0;
     int score = 0;
 
+    //  Game State.
     boolean GamePlaying = false;
     boolean GameOver = false;
+
+    final int GS_STOPPED = 0;
+    final int GS_LOADING = 1;
+    final int GS_PLAYING = 2;
+    final int GS_GAMEOVER = 3;
+    final int GS_PAUSED = 4;
+    int GameState = GS_STOPPED;
+
+    // Add Settings.
     public boolean PayedVersion;
 
+    //  Timer.
     TimerTask MoveEvent = new TimerTask() {
         @Override
         public void run() {
@@ -312,8 +323,6 @@ public class CanvasView extends View
 
     MediaPlayer mp;
 
-    //endregion variabelen
-
     /// Init functions
 
     public CanvasView(Context context)
@@ -368,6 +377,8 @@ public class CanvasView extends View
 
         GamePlaying = true;
 
+        GameState = GS_PLAYING;
+
         handler.removeCallbacksAndMessages(null);
         handler.postDelayed(runnable, 100);
     }
@@ -595,6 +606,8 @@ public class CanvasView extends View
     {
         mp.pause();
         GamePlaying = false;
+
+        GameState = GS_PAUSED;
     }
 
     public void onResume()
@@ -1231,12 +1244,13 @@ public class CanvasView extends View
             {
                 if (moveX >= 28     && moveX <= 55  && moveY >= 143 && moveY <= 155)    //  Menu
                 {
-                    if (GamePlaying)
+                    if (GameState == GS_PLAYING)
                         onPause();
                     else
                     {
                         mp.start();
                         GamePlaying = true;
+                        GameState = GS_PLAYING;
                     }
                 }
             }
@@ -1244,7 +1258,7 @@ public class CanvasView extends View
 
         if (!goingDown)
         {
-            if (GamePlaying)
+            if (GameState == GS_PLAYING)
             {
                 if (!GameOver)
                 {
@@ -1311,7 +1325,7 @@ public class CanvasView extends View
     /// Game Logic
     private void GoDown()
     {
-        if (GamePlaying)
+        if (GameState == GS_PLAYING)
         {
             if (!GameOver)
             {
@@ -1337,6 +1351,9 @@ public class CanvasView extends View
                         //  GameOver
                         GameOver = true;
                         GamePlaying = false;
+
+                        GameState = GS_GAMEOVER ;
+
                         mp.stop();
                         this.postInvalidate();
                     }