diff --git a/src/de/miaurizius/jgame2d/core/GamePanel.java b/src/de/miaurizius/jgame2d/core/GamePanel.java
index 4211182..4c0d9f0 100644
--- a/src/de/miaurizius/jgame2d/core/GamePanel.java
+++ b/src/de/miaurizius/jgame2d/core/GamePanel.java
@@ -6,6 +6,8 @@ import de.miaurizius.jgame2d.tile.TileManager;
 
 import javax.swing.*;
 import java.awt.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class GamePanel extends JPanel implements Runnable {
 
@@ -96,11 +98,28 @@ public class GamePanel extends JPanel implements Runnable {
         super.paintComponent(graphics);
         Graphics2D graphics2d = (Graphics2D) graphics;
 
+        // DEBUG
+        long drawStart = 0;
+        drawStart = System.nanoTime();
+
         //Draw all components
         tileM.draw(graphics2d);
         for (SuperObject superObject : obj) if (superObject != null) superObject.draw(graphics2d, this);
         player.draw(graphics2d);
         ui.draw(graphics2d);
+
+        long drawEnd = System.nanoTime();
+        long passed = drawEnd - drawStart;
+
+        // DEBUG
+        if(keyH.checkDrawTime) {
+            graphics2d.setColor(Color.white);
+            graphics2d.drawString("Draw Time: " + passed, 10, 400);
+            System.out.println("Draw Time: " + passed);
+            Logger.getLogger("DEBUG").log(Level.FINE, "Draw Time: " + passed);
+        }
+
+        // END
         graphics.dispose();
     }
 
diff --git a/src/de/miaurizius/jgame2d/core/KeyHandler.java b/src/de/miaurizius/jgame2d/core/KeyHandler.java
index ea64e9b..5901c84 100644
--- a/src/de/miaurizius/jgame2d/core/KeyHandler.java
+++ b/src/de/miaurizius/jgame2d/core/KeyHandler.java
@@ -6,6 +6,8 @@ import java.awt.event.KeyListener;
 public class KeyHandler implements KeyListener {
 
     public boolean upPressed, downPressed, leftPressed, rightPressed;
+    // DEBUG
+    public boolean checkDrawTime = false;
 
     @Override
     public void keyTyped(KeyEvent e) {}
@@ -14,18 +16,11 @@ public class KeyHandler implements KeyListener {
     public void keyPressed(KeyEvent e) {
         int code = e.getKeyCode();
         switch (code) {
-            case KeyEvent.VK_W, KeyEvent.VK_UP:
-                upPressed = true;
-                break;
-            case KeyEvent.VK_S, KeyEvent.VK_DOWN:
-                downPressed = true;
-                break;
-            case KeyEvent.VK_A, KeyEvent.VK_LEFT:
-                leftPressed = true;
-                break;
-            case KeyEvent.VK_D, KeyEvent.VK_RIGHT:
-                rightPressed = true;
-                break;
+            case KeyEvent.VK_W, KeyEvent.VK_UP -> upPressed = true;
+            case KeyEvent.VK_S, KeyEvent.VK_DOWN -> downPressed = true;
+            case KeyEvent.VK_A, KeyEvent.VK_LEFT -> leftPressed = true;
+            case KeyEvent.VK_D, KeyEvent.VK_RIGHT -> rightPressed = true;
+            case KeyEvent.VK_T -> checkDrawTime = !checkDrawTime;
         }
     }
 
@@ -33,18 +28,10 @@ public class KeyHandler implements KeyListener {
     public void keyReleased(KeyEvent e) {
         int code = e.getKeyCode();
         switch (code) {
-            case KeyEvent.VK_W,  KeyEvent.VK_UP:
-                upPressed = false;
-                break;
-            case KeyEvent.VK_S,  KeyEvent.VK_DOWN:
-                downPressed = false;
-                break;
-            case KeyEvent.VK_A, KeyEvent.VK_LEFT:
-                leftPressed = false;
-                break;
-            case KeyEvent.VK_D, KeyEvent.VK_RIGHT:
-                rightPressed = false;
-                break;
+            case KeyEvent.VK_W,  KeyEvent.VK_UP -> upPressed = false;
+            case KeyEvent.VK_S,  KeyEvent.VK_DOWN -> downPressed = false;
+            case KeyEvent.VK_A, KeyEvent.VK_LEFT -> leftPressed = false;
+            case KeyEvent.VK_D, KeyEvent.VK_RIGHT -> rightPressed = false;
         }
     }
 }