diff --git a/BIN/SH.S.CMD.txt b/BIN/SH.S.CMD.txt
index 6cb12f43..b9793063 100644
--- a/BIN/SH.S.CMD.txt
+++ b/BIN/SH.S.CMD.txt
@@ -390,9 +390,7 @@ CMD.GETKEY		lda (ZPArgVBufPtr)
 				beq .99
 
 				>SYSCALL getchar
-				bcc .1
-				tay
-				bne .9
+				bcs .9
 	
 .1				>PUSHA
 				>PUSHBI 1
diff --git a/BIN/SH.S.txt b/BIN/SH.S.txt
index e22cddf5..74a4233c 100644
--- a/BIN/SH.S.txt
+++ b/BIN/SH.S.txt
@@ -226,9 +226,8 @@ CS.RUN.LOOP
 .1				jsr CheckSleep
 				beq .3
 				
-				>SLEEP
 				>SYSCALL GetChar
-				bcs .2
+				bcs .9					I/O err
 				
 				cmp #3					Ctrl-C
 				bne .1
@@ -240,19 +239,11 @@ CS.RUN.LOOP
 				beq .8
 				bra .1
 
-.2				tay
-				beq .1
-				rts						I/O err
-
 .3				>LDA.G bPause
 				bpl .6
 				
-.4				>SLEEP
-				>SYSCALL GetChar
-				bcc .5					got one
-				tay
-				beq .4					no char
-				rts						I/O err
+.4				>SYSCALL GetChar
+				bcs	.9					I/O err
 				
 .5				cmp #3					Ctrl-C
 				bne .60
@@ -279,8 +270,8 @@ CS.RUN.LOOP
 .7				jmp CS.RUN.READ
 
 .8				lda #3					User Interrupt
-.9				sec
-				rts
+				sec
+.9				rts
 *--------------------------------------
 CS.RUN.INTERACTIVE
 				jsr IO.Reset
@@ -299,14 +290,8 @@ CS.RUN.INTERACTIVE
 				jsr CL.PrintPrompt
 				bcs .9
 
-.1				>SLEEP
-				>SYSCALL GetChar
-				bcc .2
-
-				tay
-				beq .1					no char
-
-.9				rts						I/O error 
+.1				>SYSCALL GetChar
+				bcs .9						I/O error 
 				
 .2				cmp #C.EOF				....or Ctrl-D
 				beq .9					CS
@@ -336,18 +321,16 @@ CS.RUN.INTERACTIVE
 
 .6				jsr CORE.Run
 				
-.8				jmp CS.RUN.LOOP.END				
+.8				jmp CS.RUN.LOOP.END
+
+.9				rts			
 *--------------------------------------
 CS.RUN.READ		jsr CL.RESET
 				
-.1				>SLEEP
-				>SYSCALL GetChar
-				bcc .11
-				
-				tay
-				beq .1
-				
-.11				jsr CL.CHARIN
+.1				>SYSCALL GetChar
+				bcs .9
+
+				jsr CL.CHARIN
 
 				>LDA.G CL.bReady
 				bpl .1
@@ -374,6 +357,7 @@ CS.RUN.READ		jsr CL.RESET
 				plp
 				
 .8				jmp CS.RUN.LOOP.END
+.9				rts
 *--------------------------------------
 CS.RUN.BATCH	>SYSCALL GetChar
 				bcs .2