diff --git a/RaspberryPi/apple2driver/driver.go b/RaspberryPi/apple2driver/driver.go
index 698d862..452d348 100644
--- a/RaspberryPi/apple2driver/driver.go
+++ b/RaspberryPi/apple2driver/driver.go
@@ -33,7 +33,8 @@ const menuCommand = 8
 const shellCommand = 9
 
 func main() {
-	drive1, drive2 := getDriveFiles()
+	drive1Name, drive2Name := getFlags()
+	drive1, drive2 := getDriveFiles(drive1Name, drive2Name)
 
 	fmt.Printf("Starting Apple II RPi v%s...\n", info.Version)
 
@@ -59,7 +60,7 @@ func main() {
 			case readBlockCommand:
 				var block int
 				block, err = handlers.ReadBlockCommand(drive1, drive2)
-				if err == nil && block == 0 {
+				if err == nil && block == 0 && len(drive1Name) == 0 {
 					resetCwd()
 					drive1, _ = generateDriveFromCwd()
 				}
@@ -72,7 +73,9 @@ func main() {
 				newCwd, _ := os.Getwd()
 				if newCwd != cwd {
 					cwd = newCwd
-					drive1, _ = generateDriveFromCwd()
+					if len(drive1Name) == 0 {
+						drive1, _ = generateDriveFromCwd()
+					}
 				}
 			case loadFileCommand:
 				handlers.LoadFileCommand()
@@ -88,7 +91,7 @@ func main() {
 	}
 }
 
-func getDriveFiles() (prodos.ReaderWriterAt, prodos.ReaderWriterAt) {
+func getFlags() (string, string) {
 	var drive1Name string
 	var drive2Name string
 
@@ -101,6 +104,10 @@ func getDriveFiles() (prodos.ReaderWriterAt, prodos.ReaderWriterAt) {
 	flag.StringVar(&drive2Name, "d2", "", "A ProDOS format drive image for drive 2 and will be used for drive 1 if drive 1 empty")
 	flag.Parse()
 
+	return drive1Name, drive2Name
+}
+
+func getDriveFiles(drive1Name string, drive2Name string) (prodos.ReaderWriterAt, prodos.ReaderWriterAt) {
 	var drive1 prodos.ReaderWriterAt
 	var drive2 prodos.ReaderWriterAt
 	var err error
diff --git a/RaspberryPi/apple2driver/go.mod b/RaspberryPi/apple2driver/go.mod
index 1a658fd..a4fdf3d 100644
--- a/RaspberryPi/apple2driver/go.mod
+++ b/RaspberryPi/apple2driver/go.mod
@@ -5,5 +5,5 @@ go 1.16
 require (
 	github.com/creack/pty v1.1.18
 	github.com/stianeikeland/go-rpio/v4 v4.6.0
-	github.com/tjboldt/ProDOS-Utilities v0.4.1
+	github.com/tjboldt/ProDOS-Utilities v0.4.2
 )
diff --git a/RaspberryPi/apple2driver/go.sum b/RaspberryPi/apple2driver/go.sum
index 223419e..a367a57 100644
--- a/RaspberryPi/apple2driver/go.sum
+++ b/RaspberryPi/apple2driver/go.sum
@@ -4,3 +4,5 @@ github.com/stianeikeland/go-rpio/v4 v4.6.0 h1:eAJgtw3jTtvn/CqwbC82ntcS+dtzUTgo5q
 github.com/stianeikeland/go-rpio/v4 v4.6.0/go.mod h1:A3GvHxC1Om5zaId+HqB3HKqx4K/AqeckxB7qRjxMK7o=
 github.com/tjboldt/ProDOS-Utilities v0.4.1 h1:tbXgLFXO4xh7t4XAuMgPwM9wXUcEAxH7/ByffjvgsPk=
 github.com/tjboldt/ProDOS-Utilities v0.4.1/go.mod h1:eBQRf0U+goRbBOxzFCwRW+FZmALC8dfYaqCwcqwzi74=
+github.com/tjboldt/ProDOS-Utilities v0.4.2 h1:0F02Ddhyc/su3twFNXg57boHsV0pnXKxwCPThrrSdMI=
+github.com/tjboldt/ProDOS-Utilities v0.4.2/go.mod h1:eBQRf0U+goRbBOxzFCwRW+FZmALC8dfYaqCwcqwzi74=