diff --git a/client/BUILD/a2pi.wdc.s b/client/BUILD/a2pi.wdc.s
index 2aa03f0..7e2bc20 100755
--- a/client/BUILD/a2pi.wdc.s
+++ b/client/BUILD/a2pi.wdc.s
@@ -262,7 +262,7 @@ SENDACC	PHP
 	SEI		; Disable interrupts
 	PHA
 	LDA	SSCSLOT
-	ORA	#$89+1
+	ORA	#$88+2
 	TAY
 	LDA	#$07
 	STA	$C002-2,Y	; Enable transmit IRQ
@@ -284,7 +284,7 @@ IRQWT	LDA	$C001-2,Y	; Wait for IRQ to clear
 * ACIA RECEIVE BYTE IN ACCUMULATOR
 *
 RECVACC	LDA	SSCSLOT
-	ORA	#$89+1
+	ORA	#$88+2
 	TAY
 RECVWT	LDA	$C001-2,Y
 	AND	#$08
@@ -298,9 +298,9 @@ CHKEVENT	LDA	ANYKEY	; CHECK FOR KEY PRESS/RELEASE
 	CMP	KEYSTAT
 	BNE	SENDKEY
 	LDA	SSCSLOT	; CHECK FOR INPUT TO ACIA
-	ORA	#$89+1
+	ORA	#$88+2
 	TAY
-	LDA	$C000-1,Y
+	LDA	$C001-2,Y
 	AND	#$08
 	BEQ	CHKMOU
 	LDA	$C000-2,Y
diff --git a/client/BUILD/a2pluspi.wdc.s b/client/BUILD/a2pluspi.wdc.s
index 4f280b8..9622f54 100755
--- a/client/BUILD/a2pluspi.wdc.s
+++ b/client/BUILD/a2pluspi.wdc.s
@@ -231,14 +231,14 @@ SENDACC	PHP
 	SEI		; Disable interrupts
 	PHA
 	LDA	SSCSLOT
-	ORA	#$89+1
+	ORA	#$88+2
 	TAY
 	LDA	#$07
 	STA	$C002-2,Y	; Enable transmit IRQ
 	LDA	$C001-2,Y	; Clear any oustanding interrupts
 	PLA
 	STA	$C000-2,Y	; AVOID PHANTOM READ FROM $C0XX
-	PHA
+;	PHA
 SENDWT	LDA	$C001-2,Y
 ;	AND	#$80	; Check IRQ status
 	BPL	SENDWT
@@ -246,32 +246,38 @@ SENDWT	LDA	$C001-2,Y
 	STA	$C002-2,Y
 IRQWT	LDA	$C001-2,Y	; Wait for IRQ to clear
 	BMI	IRQWT
-	PLA
+;	PLA
 	PLP		; Restore interrupts
 	RTS
 *
 * ACIA RECEIVE BYTE IN ACCUMULATOR
 *
-RECVACC	LDA	SSCSLOT
-	ORA	#$89+1
-	TAY
-RECVWT	LDA	$C001-2,Y
+RECVACC	;LDA	SSCSLOT
+	;ORA	#$88+2
+	;TAY
+	LDY	SSCSLOT
+RECVWT	;LDA	$C001-2,Y
+	LDA	$C088,Y
 	AND	#$08
 	BEQ	RECVWT
-	LDA	$C000-2,Y
+	;LDA	$C000-2,Y
+	LDA	$C088,Y
 	RTS
 *
 * CHECK INPUT STATE FOR CHANGE
 *
 CHKEVENT	LDA	KEYBD	; CHECK FOR KEY PRESS
 	BMI	SENDKEY
-	LDA	SSCSLOT	; CHECK FOR INPUT TO ACIA
-	ORA	#$89+1
-	TAY
-	LDA	$C000-1,Y
+	LDY	SSCSLOT
+	;LDA	SSCSLOT	; CHECK FOR INPUT TO ACIA
+	;ORA	#$88+2
+	;TAY
+	;LDA	$C001-2,Y
+	LDA	$C089,Y
 	AND	#$08
 	BEQ	CHKMOU
-	LDA	$C000-2,Y
+	;LDA	$C000-2,Y
+	LDA	$C088,Y
 	JMP	HOSTREQ
 CHKMOU	DEC	WAITEV	; CHECK FOR MOUSE UPDATE
 	BEQ	UPDTMOU
diff --git a/share/A2PI-WDC.1.7.PO b/share/A2PI-WDC.1.7.PO
index 59fd712..a6a2b3a 100644
Binary files a/share/A2PI-WDC.1.7.PO and b/share/A2PI-WDC.1.7.PO differ