diff --git a/scorch.asm b/scorch.asm
index 8c3288a..a54f61a 100644
--- a/scorch.asm
+++ b/scorch.asm
@@ -432,10 +432,15 @@ getKeyAfterWait
     lda kbcode
     cmp #@kbcode._none
     beq checkJoyGetKey
+    pha
     and #$3f                   ; CTRL and SHIFT ellimination
     cmp #@kbcode._esc          ; 28  ; ESC
-    bne getkeyend
-      mvy #$80 escFlag
+    beq EscPressed
+    pla
+    jmp getkeyend
+EscPressed
+    pla
+    mvy #$80 escFlag
     bne getkeyend
 
 checkJoyGetKey
diff --git a/scorch.xex b/scorch.xex
index 705dfe2..234c55f 100644
Binary files a/scorch.xex and b/scorch.xex differ
diff --git a/scorch_cart.xex b/scorch_cart.xex
deleted file mode 100644
index 32c452b..0000000
Binary files a/scorch_cart.xex and /dev/null differ
diff --git a/weapons.asm b/weapons.asm
index e54dabb..0a705f2 100644
--- a/weapons.asm
+++ b/weapons.asm
@@ -1232,13 +1232,7 @@ notpressed
     tya
     and #%00000010
     jeq pressedTAB    ; Select key
-    lda SKSTAT
-    cmp #$ff
-    jeq checkJoy
-    cmp #$f7  ; SHIFT
-    jeq checkJoy
-
-    lda kbcode
+    jsr GetKey.getKeyAfterWait
     and #%10111111 ; SHIFT elimination
     
     cmp #@kbcode._A  ; $3f  ; A
@@ -1328,29 +1322,6 @@ NoVdebugSwitch
     .ENDIF
 EndKeys
     jmp notpressed
-checkJoy
-    ;------------JOY-------------
-    ;happy happy joy joy
-    ;check for joystick now
-    lda STICK0
-    and #$0f
-    cmp #$0f
-    beq notpressedJoy
-    tay
-    mva #0 ATRACT    ; reset atract mode
-    lda joyToKeyTable,y
-    jmp jumpFromStick
-notpressedJoy
-    .IF TARGET = 800
-    ;second fire only Atari 800
-    jsr GetKey.Check2button
-    jcc pressedTAB
-    .ENDIF
-    ;fire
-    lda STRIG0
-    jeq pressedSpace
-    mva #$ff pressTimer  ; stop counting frames
-   jmp notpressed
 
 ;
 pressedUp
@@ -2754,16 +2725,7 @@ notpressed
     jsr DrawTankEngine
     ; enimation ends
 
-    lda SKSTAT
-    cmp #$ff
-    jeq checkJoy
-    cmp #$f7  ; SHIFT
-    jeq checkJoy
-
-    lda kbcode
-    and #%00111111 ; CTRL and SHIFT elimination
-
-jumpFromStick
+    jsr GetKey.getKeyAfterWait
     cmp #@kbcode._left  ; $6
     jeq pressedLeft
     cmp #@kbcode._right  ; $7
@@ -2771,23 +2733,6 @@ jumpFromStick
     cmp #@kbcode._space  ; $21
     jeq pressedSpace
     jmp notpressed
-checkJoy
-    ;------------JOY-------------
-    ;happy happy joy joy
-    ;check for joystick now
-    lda STICK0
-    and #$0f
-    cmp #$0f
-    beq notpressedJoy
-    tay
-    lda joyToKeyTable,y
-    jmp jumpFromStick
-notpressedJoy
-    ;fire
-    lda STRIG0
-    jeq pressedSpace
-    jmp notpressed
-
 
 pressedRight
     lda ShieldEnergy,x