diff --git a/Library/Code/iso/JabyEngineISODesc.xml b/Library/Code/iso/JabyEngineISODesc.xml
index 01d4d46d..993734a7 100644
--- a/Library/Code/iso/JabyEngineISODesc.xml
+++ b/Library/Code/iso/JabyEngineISODesc.xml
@@ -15,9 +15,9 @@
 			<file name="SYSTEM.CNF"   type="data" source="Library/Code/iso/JabyEngine.cnf"/>
 			<file name="SCES_003.90"  type="data" source="Library/Code/bin/PSX-release/JabyEngine.psexe"/>
 			
-			<dummy sectors="1024"/>	
+			<!--<dummy sectors="1024"/>-->
 		</directory_tree>
 	</track>
 	<track type="audio" source="D:\PSX\projects\NEXTGPU\data\Burg.wav"/>
-  	<track type="audio" source="D:\PSX\projects\VS2019\JabyPhew\JabyPhew\Ressources\shark.wav"/>-->
+  	<track type="audio" source="D:\PSX\projects\VS2019\JabyPhew\JabyPhew\Ressources\shark.wav"/>
 </iso_project>
diff --git a/Library/Code/src/JabyEngine.cpp b/Library/Code/src/JabyEngine.cpp
index 94543f9c..dbc0e140 100644
--- a/Library/Code/src/JabyEngine.cpp
+++ b/Library/Code/src/JabyEngine.cpp
@@ -27,10 +27,10 @@ static int fill_toc() {
     return CdGetToc(TOC); // TOC
 }
 
-static void play_track(int track) {
-    for(int n = 0; n < 100; n++) {
+static void play_track(int track, int track_count) {
+    for(int n = 0; n < track_count; n++) {
         const auto& cur_toc = TOC[n];
-        printf("Now playing %i.) %x:%x:%x\n", n, cur_toc.minute, cur_toc.second, cur_toc.sector);
+        printf("Track %i.) starts at %x:%x:%x\n", n, cur_toc.minute, cur_toc.second, cur_toc.sector);
     }
 
     CdControlB(CdlSetloc, reinterpret_cast<u_char*>(&TOC[track]), 0);   // seek to start of track "track"
@@ -43,7 +43,7 @@ int main() {
 
     printf("Hello Planschi!\nI found %i tracks\n", track_count);
 
-    play_track(2);
+    play_track(2, track_count);
     while(true);
     return 0;
 }
\ No newline at end of file
diff --git a/Tools/psxcdgen b/Tools/psxcdgen
index d2df040f..68456a24 160000
--- a/Tools/psxcdgen
+++ b/Tools/psxcdgen
@@ -1 +1 @@
-Subproject commit d2df040fac0f7b6af909bd920317d0bd4d9a8148
+Subproject commit 68456a24546332c042d00ff9b162ab475478d6c5