diff --git a/MiSTer.vcxproj b/MiSTer.vcxproj
index 2b1f343..f20aea7 100644
--- a/MiSTer.vcxproj
+++ b/MiSTer.vcxproj
@@ -101,6 +101,8 @@
     <ClCompile Include="support\pcecd\pcecdd.cpp" />
     <ClCompile Include="support\pcecd\seektime.cpp" />
     <ClCompile Include="support\psx\psx.cpp" />
+    <ClCompile Include="support\saturn\saturn.cpp" />
+    <ClCompile Include="support\saturn\saturncdd.cpp" />
     <ClCompile Include="support\sharpmz\sharpmz.cpp" />
     <ClCompile Include="support\snes\snes.cpp" />
     <ClCompile Include="support\st\st_tos.cpp" />
@@ -175,6 +177,7 @@
     <ClInclude Include="support\pcecd\pcecd.h" />
     <ClInclude Include="support\psx\mcdheader.h" />
     <ClInclude Include="support\psx\psx.h" />
+    <ClInclude Include="support\saturn\saturn.h" />
     <ClInclude Include="support\sharpmz\sharpmz.h" />
     <ClInclude Include="support\snes\snes.h" />
     <ClInclude Include="support\st\st_tos.h" />
diff --git a/MiSTer.vcxproj.filters b/MiSTer.vcxproj.filters
index b063fea..7be54f0 100644
--- a/MiSTer.vcxproj.filters
+++ b/MiSTer.vcxproj.filters
@@ -235,6 +235,12 @@
     <ClCompile Include="support\neogeo\neogeocd.cpp">
       <Filter>Source Files\support</Filter>
     </ClCompile>
+    <ClCompile Include="support\saturn\saturn.cpp">
+      <Filter>Source Files\support</Filter>
+    </ClCompile>
+    <ClCompile Include="support\saturn\saturncdd.cpp">
+      <Filter>Source Files\support</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="battery.h">
@@ -459,5 +465,8 @@
     <ClInclude Include="support\neogeo\neogeocd.h">
       <Filter>Header Files\support</Filter>
     </ClInclude>
+    <ClInclude Include="support\saturn\saturn.h">
+      <Filter>Header Files\support</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/support/saturn/saturn.cpp b/support/saturn/saturn.cpp
index 4864fec..d351d7d 100644
--- a/support/saturn/saturn.cpp
+++ b/support/saturn/saturn.cpp
@@ -130,31 +130,25 @@ void saturn_set_image(int num, const char *filename)
 	char *p = strrchr(last_dir, '/');
 	if (p) *p = 0;
 
-	int loaded = 1;
 	if (!same_game)
 	{
 		saturn_mount_save("");
 
 		user_io_status_set("[0]", 1);
-		user_io_status_set("[0]", 0);
 		saturn_reset();
 
-		loaded = 0;
-		strcpy(buf, last_dir);
-		char *p = strrchr(buf, '/');
-		if (p)
+		// load CD BIOS
+		if (!saturn_load_rom(filename, "cd_bios.rom", 0)) // from disk folder.
 		{
-			strcpy(p + 1, "cd_bios.rom");
-			loaded = user_io_file_tx(buf);
+			if (!saturn_load_rom(last_dir, "cd_bios.rom", 0)) // from parent folder.
+			{
+				sprintf(buf, "%s/boot.rom", HomeDir()); // from home folder.
+				if (!user_io_file_tx(buf))
+				{
+					Info("CD BIOS not found!", 4000);
+				}
+			}
 		}
-
-		if (!loaded)
-		{
-			sprintf(buf, "%s/boot.rom", HomeDir());
-			loaded = user_io_file_tx(buf);
-		}
-
-		if (!loaded) Info("CD BIOS not found!", 4000);
 	}
 
 	if (strlen(filename))
@@ -165,13 +159,14 @@ void saturn_set_image(int num, const char *filename)
 
 			if (!same_game)
 			{
-				saturn_load_rom(filename, "cd_bios.rom", 0);
 				//saturn_load_rom(filename, "cart.rom", 1);
 				saturn_mount_save(filename);
 				//cheats_init(filename, 0);
 			}
 		}
 	}
+
+	user_io_status_set("[0]", 0);
 }
 
 void saturn_reset() {
@@ -189,7 +184,7 @@ int saturn_send_data(uint8_t* buf, int len, uint8_t index) {
 }
 
 static char int_blank[] = {
-	0x00, 0x42, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6B, 0x00, 0x55, 0x00, 0x70, 0x00, 0x52, 0x00, 0x61, 
+	0x00, 0x42, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6B, 0x00, 0x55, 0x00, 0x70, 0x00, 0x52, 0x00, 0x61,
 	0x00, 0x6D, 0x00, 0x20, 0x00, 0x46, 0x00, 0x6F, 0x00, 0x72, 0x00, 0x6D, 0x00, 0x61, 0x00, 0x74,
 	0x00, 0x42, 0x00, 0x61, 0x00, 0x63, 0x00, 0x6B, 0x00, 0x55, 0x00, 0x70, 0x00, 0x52, 0x00, 0x61,
 	0x00, 0x6D, 0x00, 0x20, 0x00, 0x46, 0x00, 0x6F, 0x00, 0x72, 0x00, 0x6D, 0x00, 0x61, 0x00, 0x74,