diff --git a/TODO.md b/TODO.md
index 90cf64d..123d946 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,2 +1,2 @@
-* Fix collision while in air
-* Fix jumping while in air (disallow)
\ No newline at end of file
+* Detect duplicate connection
+* (add trampoline)
\ No newline at end of file
diff --git a/assets/NoSleep.min.js b/assets/NoSleep.min.js
new file mode 100644
index 0000000..3768ef7
--- /dev/null
+++ b/assets/NoSleep.min.js
@@ -0,0 +1,2 @@
+/*! NoSleep.min.js v0.7.0 - git.io/vfn01 - Rich Tibbett - MIT license */
+!function(A,B){"object"==typeof exports&&"object"==typeof module?module.exports=B():"function"==typeof define&&define.amd?define([],B):"object"==typeof exports?exports.NoSleep=B():A.NoSleep=B()}(this,function(){return function(A){function B(e){if(Q[e])return Q[e].exports;var o=Q[e]={i:e,l:!1,exports:{}};return A[e].call(o.exports,o,o.exports,B),o.l=!0,o.exports}var Q={};return B.m=A,B.c=Q,B.d=function(A,Q,e){B.o(A,Q)||Object.defineProperty(A,Q,{configurable:!1,enumerable:!0,get:e})},B.n=function(A){var Q=A&&A.__esModule?function(){return A.default}:function(){return A};return B.d(Q,"a",Q),Q},B.o=function(A,B){return Object.prototype.hasOwnProperty.call(A,B)},B.p="",B(B.s=0)}([function(A,B,Q){"use strict";function e(A,B){if(!(A instanceof B))throw new TypeError("Cannot call a class as a function")}var o=function(){function A(A,B){for(var Q=0;Q<B.length;Q++){var e=B[Q];e.enumerable=e.enumerable||!1,e.configurable=!0,"value"in e&&(e.writable=!0),Object.defineProperty(A,e.key,e)}}return function(B,Q,e){return Q&&A(B.prototype,Q),e&&A(B,e),B}}(),t=Q(1),n="undefined"!=typeof navigator&&parseFloat((""+(/CPU.*OS ([0-9_]{3,4})[0-9_]{0,1}|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent)||[0,""])[1]).replace("undefined","3_2").replace("_",".").replace("_",""))<10&&!window.MSStream,E=function(){function A(){e(this,A),n?this.noSleepTimer=null:(this.noSleepVideo=document.createElement("video"),this.noSleepVideo.setAttribute("playsinline",""),this.noSleepVideo.setAttribute("src",t),this.noSleepVideo.addEventListener("timeupdate",function(A){this.noSleepVideo.currentTime>.5&&(this.noSleepVideo.currentTime=Math.random())}.bind(this)))}return o(A,[{key:"enable",value:function(){n?(this.disable(),this.noSleepTimer=window.setInterval(function(){window.location.href="/",window.setTimeout(window.stop,0)},15e3)):this.noSleepVideo.play()}},{key:"disable",value:function(){n?this.noSleepTimer&&(window.clearInterval(this.noSleepTimer),this.noSleepTimer=null):this.noSleepVideo.pause()}}]),A}();A.exports=E},function(A,B,Q){"use strict";A.exports="data:video/mp4;base64,AAAAIGZ0eXBtcDQyAAACAGlzb21pc28yYXZjMW1wNDEAAAAIZnJlZQAACKBtZGF0AAAC8wYF///v3EXpvebZSLeWLNgg2SPu73gyNjQgLSBjb3JlIDE0MiByMjQ3OSBkZDc5YTYxIC0gSC4yNjQvTVBFRy00IEFWQyBjb2RlYyAtIENvcHlsZWZ0IDIwMDMtMjAxNCAtIGh0dHA6Ly93d3cudmlkZW9sYW4ub3JnL3gyNjQuaHRtbCAtIG9wdGlvbnM6IGNhYmFjPTEgcmVmPTEgZGVibG9jaz0xOjA6MCBhbmFseXNlPTB4MToweDExMSBtZT1oZXggc3VibWU9MiBwc3k9MSBwc3lfcmQ9MS4wMDowLjAwIG1peGVkX3JlZj0wIG1lX3JhbmdlPTE2IGNocm9tYV9tZT0xIHRyZWxsaXM9MCA4eDhkY3Q9MCBjcW09MCBkZWFkem9uZT0yMSwxMSBmYXN0X3Bza2lwPTEgY2hyb21hX3FwX29mZnNldD0wIHRocmVhZHM9NiBsb29rYWhlYWRfdGhyZWFkcz0xIHNsaWNlZF90aHJlYWRzPTAgbnI9MCBkZWNpbWF0ZT0xIGludGVybGFjZWQ9MCBibHVyYXlfY29tcGF0PTAgY29uc3RyYWluZWRfaW50cmE9MCBiZnJhbWVzPTMgYl9weXJhbWlkPTIgYl9hZGFwdD0xIGJfYmlhcz0wIGRpcmVjdD0xIHdlaWdodGI9MSBvcGVuX2dvcD0wIHdlaWdodHA9MSBrZXlpbnQ9MzAwIGtleWludF9taW49MzAgc2NlbmVjdXQ9NDAgaW50cmFfcmVmcmVzaD0wIHJjX2xvb2thaGVhZD0xMCByYz1jcmYgbWJ0cmVlPTEgY3JmPTIwLjAgcWNvbXA9MC42MCBxcG1pbj0wIHFwbWF4PTY5IHFwc3RlcD00IHZidl9tYXhyYXRlPTIwMDAwIHZidl9idWZzaXplPTI1MDAwIGNyZl9tYXg9MC4wIG5hbF9ocmQ9bm9uZSBmaWxsZXI9MCBpcF9yYXRpbz0xLjQwIGFxPTE6MS4wMACAAAAAOWWIhAA3//p+C7v8tDDSTjf97w55i3SbRPO4ZY+hkjD5hbkAkL3zpJ6h/LR1CAABzgB1kqqzUorlhQAAAAxBmiQYhn/+qZYADLgAAAAJQZ5CQhX/AAj5IQAD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"}])});
\ No newline at end of file
diff --git a/assets/block_dirt_x2.png b/assets/block_dirt_x2.png
new file mode 100644
index 0000000..cfc8f3c
Binary files /dev/null and b/assets/block_dirt_x2.png differ
diff --git a/assets/block_grass_x2.png b/assets/block_grass_x2.png
new file mode 100644
index 0000000..5ab181d
Binary files /dev/null and b/assets/block_grass_x2.png differ
diff --git a/assets/char_luigi_x2.png b/assets/char_luigi_x2.png
new file mode 100644
index 0000000..5a455d6
Binary files /dev/null and b/assets/char_luigi_x2.png differ
diff --git a/assets/char_luigi_x2_left.png b/assets/char_luigi_x2_left.png
new file mode 100644
index 0000000..598d503
Binary files /dev/null and b/assets/char_luigi_x2_left.png differ
diff --git a/assets/char_mario_x2.png b/assets/char_mario_x2.png
new file mode 100644
index 0000000..0b290cd
Binary files /dev/null and b/assets/char_mario_x2.png differ
diff --git a/assets/char_mario_x2_left.png b/assets/char_mario_x2_left.png
new file mode 100644
index 0000000..e9e31d3
Binary files /dev/null and b/assets/char_mario_x2_left.png differ
diff --git a/server.js b/server.js
index cfdf7a5..435eea1 100644
--- a/server.js
+++ b/server.js
@@ -15,12 +15,12 @@ const players = [
     {
         type: 'mario',
         id: guid(),
-        points: 0
+        score: 0
     },
     {
         type: 'luigi',
         id: guid(),
-        points: 0
+        score: 0
     },
 ]
 console.log(players);
@@ -77,19 +77,22 @@ app.get('/client/:id', (req, res) => {
             type: getPlayerFromId(req.params.id).type,
         });
     else
-        res.render('client', { layout: false }); //TODO change to error
+        res.render('error', { layout: false });
 });
 
 const monitorNSP = io.of('/monitor');
 const clientNSP = io.of('/client');
 
+let count = 0;
+
 clientNSP.on('connection', socket => {
     let id = socket.request.headers.referer.split('/').slice(-1)[0];
     if (!getPlayerFromId(id)) { console.error('Wrong ID'); return; }
     console.log('Client connected.');
     monitorNSP.emit('clientConnect', getPlayerFromId(id).type);
-
-    // monitorNSP.emit('updateGameState', 1);
+    count++;
+    if (count === 2)
+        setTimeout(() => monitorNSP.emit('updateGameState', 1), 2000);
 
     let pl = getPlayerFromId(socket.request.headers.referer.split('/').slice(-1)[0]);
     socket.on('moveStart_left', () => {
diff --git a/src/views/client.hbs b/src/views/client.hbs
index f5ad3b9..3c93ae7 100644
--- a/src/views/client.hbs
+++ b/src/views/client.hbs
@@ -1,6 +1,7 @@
 <head>
     <title>MARIO Controller</title>
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <script src="/assets/NoSleep.min.js"></script>
     <script src="/socket.io/socket.io.js"></script>
     <style>
         * {
@@ -16,7 +17,7 @@
 
         html,
         body {
-            height: 100%;
+            height: 89%;
             width: 100%;
             overflow: hidden;
         }
@@ -25,16 +26,26 @@
             display: inline-block;
             position: absolute;
             bottom: 35%;
-            width: 20%;
+            width: 25%;
             height: 30%;
+            border: none;
+            color: white;
+            padding: 15px 32px;
+            text-align: center;
+            text-decoration: none;
+            font-size: 200%;
+            border-radius: 50%;
+            box-shadow: 5px 5px 2px 0px rgba(0, 0, 0, 0.75);
         }
 
         button#left {
             left: 5%;
+            background-color: #FFC107;
         }
 
         button#right {
-            left: 30%;
+            left: 35%;
+            background-color: #2196F3;
         }
 
         button#crouch,
@@ -44,10 +55,12 @@
 
         button#jump {
             top: calc(40% / 3);
+            background-color: #4CAF50;
         }
 
         button#crouch {
             bottom: calc(40% / 3);
+            background-color: #E53935;
         }
 
         warning {
@@ -84,23 +97,30 @@
     <warning>
         <span>Bitte das Smartphone drehen!</span>
     </warning>
-    <button id="left">Left</button>
-    <button id="right">Right</button>
-    <button id="jump">Jump</button>
+    <button id="left" disabled>Left</button>
+    <button id="right" disabled>Right</button>
+    <button id="jump" disabled>Jump</button>
     <button id="crouch" disabled>Crouch</button>
     <script>
-        document.body.addEventListener("contextmenu", e => e.preventDefault());
+        window.onscroll = e => e.preventDefault();
+        var noSleep = new NoSleep();
+        document.body.addEventListener("contextmenu", e => {
+            e.preventDefault()
+        });
 
         var socket = io('/client');
         Array.from(document.querySelectorAll('button')).forEach(el => {
             console.log(el.id);
             el.addEventListener('touchstart', event => {
+                noSleep.enable();
                 console.log('moveStart_' + el.id);
                 socket.emit('moveStart_' + el.id);
+                el.style.boxShadow = "2px 2px 5px 0px rgba(0, 0, 0, 0.75)";
             });
             el.addEventListener('touchend', event => {
                 console.log('moveEnd_' + el.id);
                 socket.emit('moveEnd_' + el.id);
+                el.style.boxShadow = "";
             });
         });
     </script>
diff --git a/src/views/server.hbs b/src/views/server.hbs
index 5c275d6..6d74c55 100644
--- a/src/views/server.hbs
+++ b/src/views/server.hbs
@@ -57,12 +57,12 @@
 
 <game>
     <assets style="display:none;">
-        <img id="char_mario" src="/assets/char_mario_x4.png">
-        <img id="char_mario_left" src="/assets/char_mario_x4_left.png">
-        <img id="char_luigi" src="/assets/char_luigi_x4.png">
-        <img id="char_luigi_left" src="/assets/char_luigi_x4_left.png">
-        <img id="block_dirt" src="/assets/block_dirt_x4.png">
-        <img id="block_grass" src="/assets/block_grass_x4.png">
+        <img id="char_mario" src="/assets/char_mario_x2.png">
+        <img id="char_mario_left" src="/assets/char_mario_x2_left.png">
+        <img id="char_luigi" src="/assets/char_luigi_x2.png">
+        <img id="char_luigi_left" src="/assets/char_luigi_x2_left.png">
+        <img id="block_dirt" src="/assets/block_dirt_x2.png">
+        <img id="block_grass" src="/assets/block_grass_x2.png">
     </assets>
     <canvas id="canvas"></canvas>
 </game>
@@ -137,17 +137,18 @@
     socket.on('moveStart_jump', type => {
         if (type == 'mario') {
             if (playerMario.velUp == 0 && playerMario.onGround)
-                playerMario.velUp = JUMP_HEIGHT;
+                playerMario.velUp = JUMP_TIME;
         } else if (type == 'luigi') {
             if (playerLuigi.velUp == 0 && playerLuigi.onGround)
-                playerLuigi.velUp = JUMP_HEIGHT;
+                playerLuigi.velUp = JUMP_TIME;
         }
     })
 
     /** CANVAS VARS **/
-    const BLOCK_SIZE = 128,
+    const BLOCK_SIZE = 128 / 2,
         GRAVITY = 14,
         JUMP_HEIGHT = 20,
+        JUMP_TIME = 14,
         canvas = document.getElementById('canvas'),
         ctx = canvas.getContext('2d'),
         right = window.innerWidth,
@@ -159,7 +160,6 @@
         block_dirt = document.getElementById('block_dirt'),
         block_grass = document.getElementById('block_grass');
 
-    /*let player = { "mario": new Player('char_mario'), "luigi": new Player('char_luigi') };*/
     let playerMario = new Player('char_mario');
     let playerLuigi = new Player('char_luigi');
     let colliders = [];
@@ -171,59 +171,154 @@
         window.requestAnimationFrame(draw);
     }
 
+    let offset = 0;
     function draw() {
         colliders = [];
-        ctx.clearRect(0, 0, right, bottom);
-        for (let y = bottom / BLOCK_SIZE - 2; y < bottom / BLOCK_SIZE; y++)
-            for (let x = 0; x < right / BLOCK_SIZE; x++) {
-                ctx.drawImage(block_dirt, x * BLOCK_SIZE, y * BLOCK_SIZE);
-                colliders.push({ x: x * BLOCK_SIZE, y: y * BLOCK_SIZE });
-
-            }
-        for (let x = 0; x < right / BLOCK_SIZE; x++) {
-            if (x === 4 || x === 5) continue;
-            ctx.drawImage(block_grass, x * BLOCK_SIZE, bottom - 3 * BLOCK_SIZE);
-            colliders.push({ x: x * BLOCK_SIZE, y: bottom - 3 * BLOCK_SIZE });
+        ctx.fillStyle = "#B3E5FC";
+        ctx.fillRect(0, 0, right, bottom);
+        ctx.fillStyle = "black";
+        ctx.font = "30px monospace";
+        ctx.textAlign = "left";
+        ctx.fillText("Mario: " + playerMario.score, right - 50 - 200, 50);
+        ctx.fillText("Luigi: " + playerLuigi.score, right - 50 - 200, 100);
+        if (playerMario.dead) {
+            ctx.beginPath();
+            ctx.strokeStyle = "black";
+            ctx.lineWidth = 4;
+            ctx.moveTo(right - 50 - 210, 40);
+            ctx.lineTo(right - 50 - 190 + ctx.measureText("Mario: " + playerMario.score).width, 40);
+            ctx.stroke();
+        }
+        if (playerLuigi.dead) {
+            ctx.beginPath();
+            ctx.strokeStyle = "black";
+            ctx.lineWidth = 4;
+            ctx.moveTo(right - 50 - 210, 90);
+            ctx.lineTo(right - 50 - 190 + ctx.measureText("Luigi: " + playerLuigi.score).width, 90);
+            ctx.stroke();
         }
 
-        ctx.drawImage(block_grass, 5 * BLOCK_SIZE, bottom - 6 * BLOCK_SIZE);
-        colliders.push({ x: 5 * BLOCK_SIZE, y: bottom - 6 * BLOCK_SIZE });
-        ctx.drawImage(block_grass, 5 * BLOCK_SIZE, bottom - 5 * BLOCK_SIZE);
-        colliders.push({ x: 5 * BLOCK_SIZE, y: bottom - 5 * BLOCK_SIZE });
-        ctx.drawImage(block_grass, 5 * BLOCK_SIZE, bottom - 4 * BLOCK_SIZE);
-        colliders.push({ x: 5 * BLOCK_SIZE, y: bottom - 4 * BLOCK_SIZE });
+        /*
+                for (let y = bottom / BLOCK_SIZE - 2; y < bottom / BLOCK_SIZE; y++)
+                    for (let x = 0; x < right / BLOCK_SIZE; x++)
+                        addBlock(block_dirt, x * BLOCK_SIZE, y * BLOCK_SIZE, true);
+                for (let x = 0; x < 2 * right / BLOCK_SIZE; x++) {
+                    //if (x % 3) continue;
+                    addBlock(block_grass, x * BLOCK_SIZE, bottom - 3 * BLOCK_SIZE, true);
+                }
+                for (let x = 0; x < .5 * right / BLOCK_SIZE; x++) {
+                    if (x % 3) continue;
+                    addBlock(block_dirt, x * BLOCK_SIZE, bottom - 6 * BLOCK_SIZE, true);
+                    addBlock(block_grass, x * BLOCK_SIZE, bottom - 7 * BLOCK_SIZE, true);
+                }
+                addBlock(block_dirt, 5 * BLOCK_SIZE, bottom - 4 * BLOCK_SIZE, true);
+                addBlock(block_dirt, 5 * BLOCK_SIZE, bottom - 5 * BLOCK_SIZE, true);
+                addBlock(block_grass, 5 * BLOCK_SIZE, bottom - 6 * BLOCK_SIZE, true);
+                */
 
-        //   ctx.drawImage(char_mario, 6 * BLOCK_SIZE, bottom - 5 * BLOCK_SIZE + 76); // 76 == offest to full block
-        //   ctx.drawImage(char_luigi, 5 * BLOCK_SIZE, bottom - 5 * BLOCK_SIZE + 48); // 48 == offest to full block
-        ctx.drawImage(playerMario.vel < 0 ? char_mario_left : char_mario, playerMario.x, playerMario.y);
-        ctx.drawImage(playerLuigi.vel < 0 ? char_luigi_left : char_luigi, playerLuigi.x, playerLuigi.y);
+        addBlockRow(block_grass, 0, 0, 10, true);
+        addBlock(block_grass, 4, 1, true);
+        addBlock(block_dirt, 4, 0, true);
+        addBlock(block_grass, 7, 2, true);
+        addBlock(block_dirt, 7, 1, true);
+        addBlock(block_dirt, 7, 0, true);
+        addBlockRow(block_grass, 10, 1, 5, true);
+        addBlockRow(block_dirt, 10, 0, 5, true);
+        addBlockRow(block_grass, 16, 4, 3, true);
+        addBlockRow(block_grass, 16, 0, 8, true);
+        addBlockRect(block_dirt, 19, 3, 3, 5, true);
+        addBlockRow(block_grass, 20, 8, 2, true);
+        addBlock(block_dirt, 19, 8, true);
+        addBlock(block_grass, 22, 3, true);
+        addBlock(block_grass, 24, 6, true);
+        addBlock(block_grass, 22, 9, true);
+        addBlock(block_dirt, 19, 9, true);
+        addBlock(block_grass, 19, 10, true);
+        addBlockRow(block_grass, 21, 12, 4, true);
+        addBlockRow(block_grass, 33, 0, 4, true);
+
+
+        if (!playerMario.dead)
+            ctx.drawImage(playerMario.vel < 0 ? char_mario_left : char_mario, playerMario.x, playerMario.y);
+        if (!playerLuigi.dead)
+            ctx.drawImage(playerLuigi.vel < 0 ? char_luigi_left : char_luigi, playerLuigi.x, playerLuigi.y);
 
-        playerMario.move();
         playerMario.gravity();
-        playerLuigi.move();
         playerLuigi.gravity();
 
-
+        // Scroll screen
+        const playerMove = playerMario.x > playerLuigi.x ? playerMario : playerLuigi;
+        const player = playerMario.x > playerLuigi.x ? playerLuigi : playerMario;
+        let actualOffset = 0;
+        if (playerMove.x + actualOffset >= right / 2 && playerMove.vel > 0 && playerMove.isMovePossible()) {
+            let newOffset = offset + playerMove.vel;
+            if (newOffset > offset) {
+                actualOffset = newOffset;
+                playerMove.score += playerMove.vel;
+                if (playerMove.vel === player.vel) {
+                    player.score += player.vel;
+                    player.isMovePossible();
+                }
+                if (playerMove.vel !== player.vel)
+                    player.x -= playerMove.vel;
+                if (player.x <= 0)
+                    player.dead = true;
+                if (playerMove.x <= 0)
+                    playerMove.dead = true;
+                offset = newOffset;
+            }
+            console.log(offset + ' : ' + player.vel);
+        } else {
+            playerMario.move();
+            playerLuigi.move();
+            if (playerMove.vel < 0)
+                actualOffset -= playerMove.vel;
+        }
 
         window.requestAnimationFrame(draw);
     }
 
+    function addBlockRect(texture, x, y, length, height, collide = false) {
+        for (let i = y; i < y + height; i++) {
+            addBlockRow(texture, x, i, length, collide);
+        }
+    }
+
+    function addBlockRow(texture, x, y, length, collide = false) {
+        for (let i = x; i < x + length; i++) {
+            addBlock(texture, i, y, collide);
+        }
+    }
+
+    function addBlock(texture, x, y, collide = false) {
+        ctx.drawImage(texture, x * BLOCK_SIZE - offset, bottom - (y + 1) * BLOCK_SIZE);
+        if (collide)
+            colliders.push({ x: x * BLOCK_SIZE - offset, y: bottom - (y + 1) * BLOCK_SIZE });
+    }
+
     function Player(type) {
+        /*this.x = 20 * BLOCK_SIZE;
+        this.y = bottom - 16 * BLOCK_SIZE;*/
         this.x = 0;
         this.y = 0;
         this.vel = 0;
         this.speed = 6;
         this.type = type;
-        this.height = (type === 'char_mario') ? 180 : 208;
-        this.width = 72;
+        this.height = (type === 'char_mario') ? 180 / 2 : 208 / 2;
+        this.width = 72 / 2;
         this.velUp = 0;
         this.padding = 5;
         this.lastBtn = '';
         this.onGround = false;
+        this.dead = false;
+        this.score = 0;
     }
 
     Player.prototype.gravity = function () {
-        if (this.y >= bottom - this.height) return;
+        if (this.y >= bottom) {
+            this.dead = true;
+            return;
+        }
         if (this.velUp > 0) return;
         // right movement and stopped movement
         if (this.vel >= 0) {
@@ -247,20 +342,34 @@
         this.onGround = false;
     };
 
-    Player.prototype.move = function () {
-        if (this.velUp > 3)
-            this.y = this.y - 27;
+    Player.prototype.isMovePossible = function () {
+        // colliding with bottom of block
+        if (colliders.filter(el => between(this.x, el.x - this.width + this.padding, el.x + BLOCK_SIZE - this.padding) && between(this.y, el.y, el.y + BLOCK_SIZE)).length)
+            if (this.velUp > 3)
+                this.velUp = 3;
+        if (this.velUp > 3) {
+            this.onGround = false;
+            this.y = this.y - JUMP_HEIGHT;
+        }
         if (this.velUp > 0)
             this.velUp--;
+        if (this.dead)
+            return false;
         if (this.x <= 0 && this.vel < 0)
-            return;
+            return false;
         if (this.x >= right - this.width && this.vel > 0)
-            return;
-        if (this.vel >= 0 && colliders.filter(el => between(this.x + this.width, el.x, el.x + BLOCK_SIZE) && between(this.y + this.height - this.padding, el.y, el.y + BLOCK_SIZE)).length)
-            return;
-        if (this.vel < 0 && colliders.filter(el => between(this.x, el.x, el.x + BLOCK_SIZE) && between(this.y + this.height - this.padding, el.y, el.y + BLOCK_SIZE)).length)
-            return;
+            return false;
+        if (this.vel >= 0 && colliders.filter(el => between(this.x + this.width, el.x, el.x + BLOCK_SIZE) && between(this.y - this.padding, el.y - this.height, el.y + BLOCK_SIZE)).length)
+            return false;
+        if (this.vel < 0 && colliders.filter(el => between(this.x, el.x, el.x + BLOCK_SIZE) && between(this.y - this.padding, el.y - this.height, el.y + BLOCK_SIZE)).length)
+            return false;
+        return true;
+    }
+
+    Player.prototype.move = function () {
+        if (!this.isMovePossible()) return;
         this.x = this.x + this.vel;
+        this.score += this.vel;
     }
 
     function between(val, min, max) {
@@ -272,13 +381,16 @@
 <script>
     /*** ONLY DEBUG ***/
     let lastCode;
+    let jumpPressed = false;
     document.addEventListener('keydown', (e) => {
         if (e.keyCode === 37) {
             playerMario.vel = -playerMario.speed;
             lastCode = e.keyCode;
         } else if (e.keyCode === 38) {
-            if (playerMario.onGround)
-                playerMario.velUp = JUMP_HEIGHT;
+            if (playerMario.onGround && !jumpPressed) {
+                playerMario.velUp = JUMP_TIME;
+                jumpPressed = true;
+            }
             e.preventDefault();
         } else if (e.keyCode === 39) {
             playerMario.vel = playerMario.speed;
@@ -288,6 +400,8 @@
     document.addEventListener('keyup', (e) => {
         if (e.keyCode === 37 && lastCode === e.keyCode) {
             playerMario.vel = 0;
+        } else if (e.keyCode === 38 && jumpPressed) {
+            jumpPressed = false;
         } else if (e.keyCode === 39 && lastCode === e.keyCode) {
             playerMario.vel = 0;
         }