diff --git a/TRDOS/TR_HDD_4.ASZ b/TRDOS/TR_HDD_4.ASZ
index f6ce3d4..303a132 100644
--- a/TRDOS/TR_HDD_4.ASZ
+++ b/TRDOS/TR_HDD_4.ASZ
@@ -55,72 +55,50 @@ HDD_PROG_E:
 	JP AUTO_03E4
 
 ;
-HDD_SET:;!TEST
-.loop:		 LD	A,(DE)
-		 INC	DE
-		 CP	" "
-		 JR	Z,.loop
-		 CP	"\r"
-		 JR	Z,.init
-		 ;
-		 DEC	DE
-		 DEC	DE
-		 JP	CHOOSE_HDD
-		 ;CALL	CHOOSE_HDD
-		 ;CALL	READ_BPB
-		 ;RET
+HDD_SET:
+.loop:		LD	A,(DE)
+		INC	DE
+		CP	" "
+		JR	Z,.loop
+		CP	"\r"
+		JR	Z,.check
+		;
+		DEC	DE
+		DEC	DE
+		JP	CHOOSE_HDD
 		;
 ; [x] new tr-hdd
-.init:		;CALL	CORRECT_CUR_DIR
-		DI
+.check:		DI
 		LD	BC,SLOT3
 		IN	B,(C)
-		;LD	C,A
 		LD	A,SYS_PAGE
 		OUT	(SLOT3),A
 		;
 		LD	E,DRIVE_CODES.TRDOS.HDD
 		LD	A,(SYS_PAGE.CURRENT_DIR_DRIVE_COPY)
 		CP	#FF
-		SCF
-		JR	Z,.skip
-		;
+		JR	Z,.init
 		CP	E
-		JR	C,.skip
+		JR	C,.init
+		;
 		LD	(SYS_PAGE.CURRENT_DIR_DRIVE),A
-		;
+		OUT	(C),B
+		PUSH	DE
 		AND	#0F
-		; !TEST
-		 OUT	(C),B
-		 ;
-		 PUSH	DE
-		 LD	C,BIOS.HDD_PART
-		 CALL	EXP_FNS
-		 POP	DE
-		 JR	C,CHOOSE_HDD.error
-		 ;
-		 LD	C,BIOS.SET_DISK_REDIR
-		 JP	EXP_FNS
-		 ;
-		 ;LD	(SYS_PAGE.CURRENT_HDD),A
-		;
-		;
-;.skip:		LD	A,C
-; 		OUT	(SLOT3),A
-.skip:		OUT	(C),B
+		LD	C,BIOS.HDD_PART
+		CALL	EXP_FNS
+		POP	DE
+		JR	C,CHOOSE_HDD.error
+		JR	.exit
 		;
+.init:		OUT	(C),B
 		PUSH	DE
 		LD	C,BIOS.HDD_INIT
 		CALL	EXP_FNS
 		POP	DE
 		JP	C,HDD_PROG_E
 		;
-		; LD	BC,(ZX_VARS.OPER_DISK - 1)
-		; LD A,(ZX_VARS.OPER_DISK)
-		; LD B,A
-		; XOR A
-		;LD	E,A
-		LD	C,BIOS.SET_DISK_REDIR
+.exit:		LD	C,BIOS.SET_DISK_REDIR
 		JP	EXP_FNS