diff --git a/MainForm.cs b/MainForm.cs
index 75f76d8..f55364b 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -235,7 +235,7 @@ namespace TaikoSoundEditor
             Logger.Info($"Song Name (Id) = {songName}");
             Logger.Info($"UniqueId = {id}");
 
-            if (songName==null || songName.Length!=6)
+            if (songName == null || songName.Length == 0 || songName.Length > 6) 
             {
                 WarnWithBox("Invalid song name.");                
                 return;
diff --git a/NUS3Bank.cs b/NUS3Bank.cs
index 9aea59f..9b6553a 100644
--- a/NUS3Bank.cs
+++ b/NUS3Bank.cs
@@ -31,23 +31,30 @@ namespace TaikoSoundEditor
 
 
             Write32(header, 0x4, (uint)idsp.Length);
-            for(int i=0;i<6;i++)
+            for(int i=0;i<songId.Length;i++)
             {
                 header[0xAA + i] = (byte)songId[i];
-                header[0xD4E + i] = (byte)songId[i];
+                header[0x612 + i] = (byte)songId[i];
             }
 
+            for (int i = songId.Length; i < 6; i++)
+            {
+                header[0xAA + i] = 0;
+                header[0x612 + i] = 0;
+            }
+
+
             header[0xB4] = (byte)(uniqueId & 0xFF);
             header[0xB5] = (byte)((uniqueId >> 8) & 0xFF);
 
             Write32(header, 0x4C, (uint)idsp.Length);
-            Write32(header, 0xD64, (uint)idsp.Length);
-            Write32(header, 0xE1C, (uint)idsp.Length);
+            Write32(header, 0x628, (uint)idsp.Length);
+            Write32(header, 0x74C, (uint)idsp.Length);
+            Write32(header, 0x4, (uint)idsp.Length);
 
             uint bb = (uint)(demostart * 1000);
 
-            Write32(header, 0xDDC, bb);
-            Write32(header, 0xDE4, bb);
+            Write32(header, 0x6C4, bb);            
 
             ms.Write(header);
             ms.Write(idsp);
diff --git a/Resources/song_ABCDEF_nus3bank.bin b/Resources/song_ABCDEF_nus3bank.bin
index 097881f..f6f2370 100644
Binary files a/Resources/song_ABCDEF_nus3bank.bin and b/Resources/song_ABCDEF_nus3bank.bin differ