diff --git a/Atari/gr_basics.asm b/Atari/gr_basics.asm
index b7dbe55..71cf658 100644
--- a/Atari/gr_basics.asm
+++ b/Atari/gr_basics.asm
@@ -220,5 +220,18 @@ ClearPlot
     bne @-
 	rts
 .endp
+;--------------------------------------------------
+.proc SetMainScreen
+;    mva #0 dmactls 
+    SetDLI DLIinterruptGraph  ; jsr SetDLI for graphics (game) screen
+    mwa #dl dlptrs  ; issue #72 (glitches when switches)
+    lda #%00111110
+;    and #$fc
+;    ora #$02     ; 2=normal, 3 = wide screen width
+    sta dmactls
+	mva WallsType COLBAKS	; set color of background 
+    jsr WaitOneFrame
+    rts
+.endp
 
 .ENDIF
\ No newline at end of file
diff --git a/C64/gr_basics.asm b/C64/gr_basics.asm
index 7ad8115..f359e6c 100644
--- a/C64/gr_basics.asm
+++ b/C64/gr_basics.asm
@@ -220,5 +220,12 @@ ClearPlot
     bne @-
 	rts
 .endp
+;--------------------------------------------------
+.proc SetMainScreen
+	SwitchVICBank(0)
+	SetScreenMemory(displayC64)
+	SetHiresBitmapMode	; Hires mode on
+    rts
+.endp
 
 .ENDIF
\ No newline at end of file
diff --git a/grafproc.asm b/grafproc.asm
index 30930aa..2bd2fac 100644
--- a/grafproc.asm
+++ b/grafproc.asm
@@ -2244,19 +2244,6 @@ quit_seppuku
    
 .endp
 
-;--------------------------------------------------
-.proc SetMainScreen
-;    mva #0 dmactls 
-    SetDLI DLIinterruptGraph  ; jsr SetDLI for graphics (game) screen
-    mwa #dl dlptrs  ; issue #72 (glitches when switches)
-    lda #%00111110
-;    and #$fc
-;    ora #$02     ; 2=normal, 3 = wide screen width
-    sta dmactls
-	mva WallsType COLBAKS	; set color of background 
-    jsr WaitOneFrame
-    rts
-.endp
 ; -------------------------------------
 .proc SetupXYdraw
     lda ytankstable,x
diff --git a/scorch.xex b/scorch.xex
index 87efd68..c4a31c8 100644
Binary files a/scorch.xex and b/scorch.xex differ
diff --git a/scorchC64.asm b/scorchC64.asm
index be0b0e1..59af7c8 100644
--- a/scorchC64.asm
+++ b/scorchC64.asm
@@ -182,9 +182,6 @@ FirstSTART
 	DisplayCopyPurchaseEnd = 0
 	DisplayCopyPurchaseStart = 0
 	displayC64 = $2000	;	graphics screen memory start
-	SwitchVICBank(0)
-	SetScreenMemory(displayC64)
-	SetHiresBitmapMode	; Hires mode on
 	
 	jsr MakeDarkScreen
 
@@ -219,6 +216,8 @@ FirstSTART
     ; Random INIT
 	InitializeSIDrnd
 
+
+
 ;--------------------------------------------------
 ; Main program of the game
     icl 'game.asm'
@@ -306,30 +305,7 @@ getkeyend
 ;--------------------------------------------------
 .proc WaitForKeyRelease
 ;--------------------------------------------------
-	mva #128-KeyRepeatSpeed pressTimer	; tricky
-StillWait	
-	bit pressTimer
-	bmi KeyReleased
-      lda STICK0
-      and #$0f
-      cmp #$0f
-      bne StillWait
-      lda STRIG0
-      beq StillWait
-    .IF TARGET = 800
-      lda SKSTAT
-      cmp #$ff
-      bne StillWait
-      lda CONSOL
-      and #%00000110	; Select and Option only
-      cmp #%00000110
-      bne StillWait
-	.ELSE
-	lda SkStatSimulator
-	and #%11111110
-	beq StillWait
-    .ENDIF
-KeyReleased
+StillWait
       rts
 .endp
 ;--------------------------------------------------
diff --git a/scorchC64.prg b/scorchC64.prg
index 1721170..b647c2f 100644
Binary files a/scorchC64.prg and b/scorchC64.prg differ