diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom
index 30d54dee..95d1bd01 100644
Binary files a/bin/basic_generic.rom and b/bin/basic_generic.rom differ
diff --git a/bin/basic_generic_crt.rom b/bin/basic_generic_crt.rom
index f8eff4df..1e6104fd 100644
Binary files a/bin/basic_generic_crt.rom and b/bin/basic_generic_crt.rom differ
diff --git a/bin/basic_ultimate64.rom b/bin/basic_ultimate64.rom
index d5158567..a37fb327 100644
Binary files a/bin/basic_ultimate64.rom and b/bin/basic_ultimate64.rom differ
diff --git a/bin/extrom_generic_crt.crt b/bin/extrom_generic_crt.crt
index 7827e060..de6c5579 100644
Binary files a/bin/extrom_generic_crt.crt and b/bin/extrom_generic_crt.crt differ
diff --git a/bin/kernal_generic.rom b/bin/kernal_generic.rom
index 252077d2..dfefccd4 100644
Binary files a/bin/kernal_generic.rom and b/bin/kernal_generic.rom differ
diff --git a/bin/kernal_generic_crt.rom b/bin/kernal_generic_crt.rom
index dcbb525a..74035f8d 100644
Binary files a/bin/kernal_generic_crt.rom and b/bin/kernal_generic_crt.rom differ
diff --git a/bin/kernal_ultimate64.rom b/bin/kernal_ultimate64.rom
index 3ecb2aec..50e7685e 100644
Binary files a/bin/kernal_ultimate64.rom and b/bin/kernal_ultimate64.rom differ
diff --git a/src/dos_m65/pseudoiec/msg_acptr.s b/src/dos_m65/pseudoiec/msg_acptr.s
index 8afbb02a..27b4741f 100644
--- a/src/dos_m65/pseudoiec/msg_acptr.s
+++ b/src/dos_m65/pseudoiec/msg_acptr.s
@@ -89,12 +89,7 @@ msg_ACPTR_read_F0:
 	; If new length is 0, try to read next block of data
 
 	ora F0_ACPTR_LEN+1
-	bne @3
-	jsr disk_f0_cmd_READ
-	bcc @3
-	jsr kernalstatus_EOI
-@3:
-	jmp dos_EXIT_CLC
+	bra msg_ACPTR_read_XX_common
 
 msg_ACPTR_read_F1:
 
@@ -119,16 +114,21 @@ msg_ACPTR_read_F1:
 	; If new length is 0, try to read next block of data
 
 	ora F1_ACPTR_LEN+1
-	bne @3
-	jsr disk_f1_cmd_READ
+	bra msg_ACPTR_read_XX_common
+
+msg_ACPTR_read_RD:
+
+	; XXX provide implementation
+
+msg_ACPTR_read_XX_common:
+
+	bne @3                  
+	jsr disk_xx_cmd_READ
 	bcc @3
 	jsr kernalstatus_EOI
 @3:
 	jmp dos_EXIT_CLC
 
-msg_ACPTR_read_RD:
-
-	; XXX provide implementation
 
 
 msg_ACPTR_fail_no_data:
diff --git a/src/dos_m65/unit_disk/disk_fd_cmd_read.s b/src/dos_m65/unit_disk/disk_xx_cmd_read.s
similarity index 54%
rename from src/dos_m65/unit_disk/disk_fd_cmd_read.s
rename to src/dos_m65/unit_disk/disk_xx_cmd_read.s
index 49d85d6a..b809af20 100644
--- a/src/dos_m65/unit_disk/disk_fd_cmd_read.s
+++ b/src/dos_m65/unit_disk/disk_xx_cmd_read.s
@@ -4,21 +4,16 @@
 ;
 
 
-disk_f0_cmd_READ:
+disk_xx_cmd_READ:
 
-	; XXX provide implementation
-
-disk_f1_cmd_READ:
-
-	; XXX provide implementation
-
-disk_f__cmd_READ:
-
-	lda F0_MODE
+    ldx PAR_FSINSTANCE
+	lda XX_MODE, x
 	cmp #$03
 	+beq fs_cbm_nextfileblock
 
-	lda F0_DIR_PHASE
+	; Reading directory
+
+	lda XX_DIR_PHASE, x
 	cmp #$01
 	+beq fs_cbm_read_dir
 	cmp #$02