diff --git a/Makefile b/Makefile
index 2270fe2..91e171b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SYS8K=2400
+SYS8K=2050
 SYS16K=8192
 SYS32K=20480
 default:
diff --git a/README.md b/README.md
index f59cf81..9aac8d0 100644
--- a/README.md
+++ b/README.md
@@ -98,18 +98,18 @@ Basic:
 
 The higher memory versions with the BASIC save/load extension
 
-- petterm8K_40G.prg - 40 column PETs with graphics keyboard, BASIC save/load, higher memory version (SYS 3200)
-- petterm8K_80G.prg - 80 column PETs with graphics keyboard, BASIC save/load, higher memory version (SYS 3200)
-- petterm8K_40B.prg - 40 column PETs with business keyboard, BASIC save/load, higher memory version (SYS 3200)
-- petterm8K_80B.prg - 80 column PETs with business keyboard, BASIC save/load, higher memory version (SYS 3200)
+- petterm8K_40G.prg - 40 column PETs with graphics keyboard, BASIC save/load, higher memory version (SYS 2050)
+- petterm8K_80G.prg - 80 column PETs with graphics keyboard, BASIC save/load, higher memory version (SYS 2050)
+- petterm8K_40B.prg - 40 column PETs with business keyboard, BASIC save/load, higher memory version (SYS 2050)
+- petterm8K_80B.prg - 80 column PETs with business keyboard, BASIC save/load, higher memory version (SYS 2050)
 - petterm16K_40G.prg - 40 column PETs with graphics keyboard, BASIC save/load, higher memory version (SYS 8192)
 - petterm16K_80G.prg - 80 column PETs with graphics keyboard, BASIC save/load, higher memory version (SYS 8192)
 - petterm16K_40B.prg - 40 column PETs with business keyboard, BASIC save/load, higher memory version (SYS 8192)
 - petterm16K_80B.prg - 80 column PETs with business keyboard, BASIC save/load, higher memory version (SYS 8192)
-- petterm32K_40G.prg - 40 column PETs with graphics keyboard, BASIC save/load, higher memory version (SYS 24576)
-- petterm32K_80G.prg - 80 column PETs with graphics keyboard, BASIC save/load, higher memory version (SYS 24576)
-- petterm32K_40B.prg - 40 column PETs with business keyboard, BASIC save/load, higher memory version (SYS 24576)
-- petterm32K_80B.prg - 80 column PETs with business keyboard, BASIC save/load, higher memory version (SYS 24576)
+- petterm32K_40G.prg - 40 column PETs with graphics keyboard, BASIC save/load, higher memory version (SYS 20480)
+- petterm32K_80G.prg - 80 column PETs with graphics keyboard, BASIC save/load, higher memory version (SYS 20480)
+- petterm32K_40B.prg - 40 column PETs with business keyboard, BASIC save/load, higher memory version (SYS 20480)
+- petterm32K_80B.prg - 80 column PETs with business keyboard, BASIC save/load, higher memory version (SYS 20480)
 
 PRG files are the native programs, can be added to a tape or disk image
 
diff --git a/constants.s b/constants.s
index eb7e61f..6e115b7 100644
--- a/constants.s
+++ b/constants.s
@@ -75,20 +75,19 @@ BAS1_EOA		EQU	$0080	; 80/81 - End of Arrays Ptr
 ; Memory location for this program.
     IFCONST HIMEM
         IFCONST MEM8K
-MYORG		EQU	$0960 ; SYS 2400 (1,1375 bytes for BASIC)
-MYRORG		EQU	$1AFF
+MYORG		EQU	$0802	; SYS 2050 (1,024 bytes for BASIC)
+MYRORG		EQU	$1FFF
         ENDIF
         IFCONST MEM16K
-MYORG		EQU	 $2000 ; SYS 8192 (7,167 bytes for BASIC)
+MYORG		EQU	 $2000	; SYS 8192 (7,167 bytes for BASIC)
 MYRORG		EQU	 $3A34
         ENDIF
         IFCONST MEM32K
-MYORG		EQU	$5000 ; SYS 20480 (19,455 bytes for BASIC)
+MYORG		EQU	$5000	; SYS 20480 (19,455 bytes for BASIC)
 MYRORG		EQU	$7000
         ENDIF
     ELSE
-MYORG		EQU	$0960 ; SYS 2400
-MYRORG		EQU	$1AFF
+MYRORG		EQU	$1FFF
     ENDIF
 
 ; Start of BASIC on PET/CBM computers
diff --git a/petterm.s b/petterm.s
index c06ba27..fdbf07a 100644
--- a/petterm.s
+++ b/petterm.s
@@ -225,19 +225,21 @@ BLDR
 	DC.W 10		; Line Number = 10
 	DC.B $9E	; SYS
 	; Decimal Address in ASCII $30 is 0 $31 is 1, etc
-	DC.B (MYORG/10000)%10 + '0
-	DC.B (MYORG/ 1000)%10 + '0
-	DC.B (MYORG/  100)%10 + '0
-	DC.B (MYORG/   10)%10 + '0
-	DC.B (MYORG/    1)%10 + '0
+	DC.B (INIT/10000)%10 + '0
+	DC.B (INIT/ 1000)%10 + '0
+	DC.B (INIT/  100)%10 + '0
+	DC.B (INIT/   10)%10 + '0
+	DC.B (INIT/    1)%10 + '0
 
 	DC.B $0		; Line End
 BLDR_ENDL
 	DC.W $0		; LINK (End of program)
 ;-----------------------------------------------------------------------
-    ENDIF
+    ELSE
 
 	ORG MYORG
+
+    ENDIF
 ;-----------------------------------------------------------------------
 ; Initialization
 INIT	SUBROUTINE