diff --git a/bin/acorn/BBCBASIC.COM b/bin/acorn/BBCBASIC.COM
index 45a2f79..ef1bb40 100644
Binary files a/bin/acorn/BBCBASIC.COM and b/bin/acorn/BBCBASIC.COM differ
diff --git a/bin/cpm/BBCBASIC.COM b/bin/cpm/BBCBASIC.COM
index 87c6efd..e541f3f 100644
Binary files a/bin/cpm/BBCBASIC.COM and b/bin/cpm/BBCBASIC.COM differ
diff --git a/src/EVAL.Z80 b/src/EVAL.Z80
index 75ff590..173beb3 100644
--- a/src/EVAL.Z80
+++ b/src/EVAL.Z80
@@ -13,6 +13,7 @@
 ;VERSION 5.0, 31-05-2024
 ;VERSION 5.1, 28-12-2024
 ;VERSION 5.2, 11-01-2025
+;VERSION 5.3, 16-03-2025 (Shifts moved to new codes)
 ;
 ;BINARY FLOATING POINT REPRESENTATION:
 ; 32 BIT SIGN-MAGNITUDE NORMALIZED MANTISSA
@@ -275,7 +276,7 @@ SHIFT:	CP	'='
 	INC	IY
 	INC	B
 SHIFT1:	LD	A,B
-	SUB	18
+	SUB	16
 	JR	EXPR2D
 ;
 EXPR2S:	EX	AF,AF'
diff --git a/src/MATH.Z80 b/src/MATH.Z80
index bf886d9..338e9c9 100644
--- a/src/MATH.Z80
+++ b/src/MATH.Z80
@@ -1,10 +1,11 @@
-	TITLE	'(C) COPYRIGHT R.T.RUSSELL 1986-2024'
+	TITLE	'(C) COPYRIGHT R.T.RUSSELL 1986-2025'
 ;
 ;Z80 FLOATING POINT PACKAGE
 ;(C) COPYRIGHT  R.T.RUSSELL  1986-2024
 ;VERSION 0.0, 26-10-1986
 ;VERSION 0.1, 14-12-1988 (BUG FIX)
 ;VERSION 5.0, 16-06-2024 (SHIFTS ADDED)
+;VERSION 5.1, 16-03-2025 (Shifts moved to new codes)
 ;
 ;BINARY FLOATING POINT REPRESENTATION:
 ;   32 BIT SIGN-MAGNITUDE NORMALIZED MANTISSA
@@ -129,10 +130,13 @@ FTABLE:	DEFW	ABS		;16 ABS
 	DEFW	FTEST		;40 TEST
 	DEFW	FCOMP		;41 COMPARE
 ;
-	DEFW	ISHL		;42 <<
-	DEFW	ISHX		;43 <<<
-	DEFW	ISAR		;44 >>
-	DEFW	ISHR		;45 >>>
+	DEFW	BAD		;42 Reserved for Z88
+	DEFW	BAD		;43 Reserved for Z88
+;
+	DEFW	ISHL		;44 <<
+	DEFW	ISHX		;45 <<<
+	DEFW	ISAR		;46 >>
+	DEFW	ISHR		;47 >>>
 ;
 RTABLE:	DEFW	FAND		;AND (FLOATING-POINT)
 	DEFW	FBDIV		;DIV
@@ -591,16 +595,16 @@ TRUE:	LD	HL,-1
 ;
 ISHX:
 ISHL:	CALL	SHIFTS
-	JR	Z,SHRET
+	RET	Z
 ISHL1:	EXX
 	ADD	HL,HL
 	EXX
 	ADC	HL,HL
 	DJNZ	ISHL1
-SHRET:	RET
+	RET
 ;
 ISAR:	CALL	SHIFTS
-	JR	Z,SHRET
+	RET	Z
 ISAR1:	SRA	H
 	RR	L
 	EXX
@@ -611,7 +615,7 @@ ISAR1:	SRA	H
 	RET
 ;
 ISHR:	CALL	SHIFTS
-	JR	Z,SHRET
+	RET	Z
 ISHR1:	SRL	H
 	RR	L
 	EXX
@@ -629,10 +633,10 @@ SHIFTS:	CALL	FIX2
 	LD	A,E
 	EXX
 	LD	B,32
-	JR	NZ,SHMAX
+	RET	NZ
 	LD	B,A
 	OR	A
-SHMAX:	RET
+	RET
 ;
 ;FUNCTIONS:
 ;