diff --git a/frontend/core/src/com/game/tankwars/controller/GameController.java b/frontend/core/src/com/game/tankwars/controller/GameController.java
index a5ec5482fc4c6f9bd78ca9328e08fcd25371bbed..35873e29469388e0beb4eac43122aafeaf7523b3 100644
--- a/frontend/core/src/com/game/tankwars/controller/GameController.java
+++ b/frontend/core/src/com/game/tankwars/controller/GameController.java
@@ -5,7 +5,6 @@ import com.badlogic.gdx.Input;
 import com.badlogic.gdx.scenes.scene2d.Actor;
 import com.badlogic.gdx.scenes.scene2d.InputEvent;
 import com.badlogic.gdx.scenes.scene2d.InputListener;
-import com.badlogic.gdx.scenes.scene2d.Touchable;
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
 import com.game.tankwars.TankWarsGame;
 import com.game.tankwars.model.Bullet;
@@ -39,17 +38,20 @@ public class GameController {
             tank.rotateCannonRight();
         }
 
-        if(Gdx.input.justTouched()) {
-            bullet = new Bullet(tank);
-            bullet.shoot();
+        if(moveRightTouched) {
+            tank.moveRight();
+        }
+        else if(moveLeftTouched) {
+            tank.moveLeft();
         }
     }
 
     public void handleHudEvents() {
         hud.getFireButton().addListener(new ChangeListener() {
             public void changed (ChangeEvent event, Actor actor) {
-                System.out.println("Changed!");
-                actor.setTouchable(Touchable.disabled);
+                bullet = new Bullet(tank);
+                bullet.shoot();
+                //actor.setTouchable(Touchable.disabled);
                 // TODO: send turn  to server + enable touchable when it is players turn
                 endPlayerTurn();
             }
@@ -91,20 +93,7 @@ public class GameController {
 
         });
 
-        if(moveRightTouched) {
-            tank.moveRight();
-        }
-        if(moveLeftTouched) {
-            tank.moveLeft();
-        }
-    }
-
-    public boolean isMoveRightTouched() {
-        return moveRightTouched;
-    }
 
-    public boolean isMoveLeftTouched() {
-        return moveLeftTouched;
     }
 
     public boolean endPlayerTurn() {