diff --git a/CommandHandler.cs b/CommandHandler.cs
index de42765..3d23819 100644
--- a/CommandHandler.cs
+++ b/CommandHandler.cs
@@ -8,6 +8,7 @@ using System.Windows.Forms;
 using System.Collections.Generic;
 using System.Diagnostics;
 using DBObj;
+using OverlayFormObj;
 namespace DualScreenDemo
 {
     public class CommandHandler
diff --git a/DBObj/SongListManager.cs b/DBObj/SongListManager.cs
index 2b48d13..8bdb03d 100644
--- a/DBObj/SongListManager.cs
+++ b/DBObj/SongListManager.cs
@@ -262,26 +262,17 @@ namespace DBObj
                                 string artistB = reader["歌星 B"].ToString();
                                 string artistACategory = reader["歌星A分類"].ToString(); 
                                 string artistBCategory = reader["歌星B分類"].ToString(); 
-                                string dateValue = reader["新增日期"].ToString();
+                                string dateValue = reader["新增日期"]?.ToString() ?? ""; 
                                 DateTime addedTime;
-
-                                if (string.IsNullOrWhiteSpace(dateValue))
+                                try
                                 {
-                                    // Console.WriteLine(String.Format("Date value is null or empty for song: {0}. Setting to default DateTime.", song));
-                                    addedTime = DateTime.Now; 
+                                    addedTime=DateTime.Parse(dateValue, CultureInfo.InvariantCulture).Date ;
                                 }
-                                else
+                                catch (System.FormatException)
                                 {
-                                    try
-                                    {
-                                        addedTime = DateTime.ParseExact(dateValue, "yyyy-MM-dd", CultureInfo.InvariantCulture);
-                                    }
-                                    catch (System.FormatException ex)
-                                    {
-                                        //Console.WriteLine(String.Format("Invalid date format for song: {0}. Error: {1}", song, ex.Message));
-                                        addedTime = DateTime.Now; 
-                                    }
+                                    addedTime = DateTime.Today;
                                 }
+                                addedTime = DateTime.Today;
                                 string basePathHost1 = reader["路徑 1"].ToString();
                                 string basePathHost2 = reader["路徑 2"].ToString();
                                 string fileName = reader["歌曲檔名"].ToString();
diff --git a/HttpServer.cs b/HttpServer.cs
index 6bb2735..33af7c6 100644
--- a/HttpServer.cs
+++ b/HttpServer.cs
@@ -18,6 +18,7 @@ using ZXingAction = ZXing.Action;
 using System.Threading;
 using System.Collections.Concurrent;
 using DBObj;
+using OverlayFormObj;
 namespace DualScreenDemo
 {
     public class HttpServer
diff --git a/OverlayForm/OverlayForm.Helpers.cs b/OverlayFormObj/OverlayForm.Helpers.cs
similarity index 99%
rename from OverlayForm/OverlayForm.Helpers.cs
rename to OverlayFormObj/OverlayForm.Helpers.cs
index 4fb3888..1a6b31c 100644
--- a/OverlayForm/OverlayForm.Helpers.cs
+++ b/OverlayFormObj/OverlayForm.Helpers.cs
@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-
-namespace DualScreenDemo
+using DualScreenDemo;
+namespace OverlayFormObj
 {
     public partial class OverlayForm
     {
diff --git a/OverlayForm/OverlayForm.Labels.cs b/OverlayFormObj/OverlayForm.Labels.cs
similarity index 99%
rename from OverlayForm/OverlayForm.Labels.cs
rename to OverlayFormObj/OverlayForm.Labels.cs
index 8bbe3ea..02b569f 100644
--- a/OverlayForm/OverlayForm.Labels.cs
+++ b/OverlayFormObj/OverlayForm.Labels.cs
@@ -8,7 +8,8 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using DBObj;
-namespace DualScreenDemo
+using DualScreenDemo;
+namespace OverlayFormObj
 {
     public partial class OverlayForm
     {
diff --git a/OverlayForm/OverlayForm.cs b/OverlayFormObj/OverlayForm.cs
similarity index 99%
rename from OverlayForm/OverlayForm.cs
rename to OverlayFormObj/OverlayForm.cs
index 44b88f0..4925e20 100644
--- a/OverlayForm/OverlayForm.cs
+++ b/OverlayFormObj/OverlayForm.cs
@@ -13,7 +13,8 @@ using ZXing;
 using ZXing.QrCode;
 using System.Timers;
 using DBObj;
-namespace DualScreenDemo
+using DualScreenDemo;
+namespace OverlayFormObj
 {
     public partial class OverlayForm : Form
     {
diff --git a/PrimaryFormParts/PrimaryForm.SyncScreen.cs b/PrimaryFormParts/PrimaryForm.SyncScreen.cs
index 053909a..67d3651 100644
--- a/PrimaryFormParts/PrimaryForm.SyncScreen.cs
+++ b/PrimaryFormParts/PrimaryForm.SyncScreen.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-
+using OverlayFormObj;
 namespace DualScreenDemo
 {
     public partial class PrimaryForm : Form
diff --git a/PrimaryFormParts/PrimaryForm.VodScreen.cs b/PrimaryFormParts/PrimaryForm.VodScreen.cs
index 38a88ef..5992dcf 100644
--- a/PrimaryFormParts/PrimaryForm.VodScreen.cs
+++ b/PrimaryFormParts/PrimaryForm.VodScreen.cs
@@ -4,6 +4,7 @@ using System.Windows.Forms;
 using System.IO;
 using System.Linq;
 using DBObj;
+using OverlayFormObj;
 namespace DualScreenDemo
 {
     public partial class PrimaryForm
diff --git a/PrimaryFormParts/PrimaryForm.cs b/PrimaryFormParts/PrimaryForm.cs
index 0633089..8e3c01f 100644
--- a/PrimaryFormParts/PrimaryForm.cs
+++ b/PrimaryFormParts/PrimaryForm.cs
@@ -12,6 +12,7 @@ using Microsoft.Ink;
 using System.Text.RegularExpressions; 
 using WMPLib;
 using DBObj;
+using OverlayFormObj;
 namespace DualScreenDemo
 {
     public partial class PrimaryForm : Form
@@ -2777,12 +2778,9 @@ private void RefreshDisplayBase()
 
          
        
-        public async void OriginalSongButton_Click(object sender, EventArgs e)
+        public  void OriginalSongButton_Click(object sender, EventArgs e)
         {
-            
-            videoPlayerForm.ToggleVocalRemoval();
-            
-            
+            videoPlayerForm.ToggleVocalRemoval();   
         }
 
         private void ReplayButton_Click(object sender, EventArgs e)
diff --git a/TCPServer.cs b/TCPServer.cs
index b729b44..c25f594 100644
--- a/TCPServer.cs
+++ b/TCPServer.cs
@@ -9,6 +9,7 @@ using System.IO; // 為 Path 和 File 提供支持
 using System.Windows.Forms; // 為 Invoke 和 Form 控件提供支持
 using System.Collections.Generic;
 using DBObj;
+using OverlayFormObj;
 namespace DualScreenDemo
 {
     public class TCPServer
diff --git a/VideoPlayerForm.cs b/VideoPlayerForm.cs
index 103184b..aec358d 100644
--- a/VideoPlayerForm.cs
+++ b/VideoPlayerForm.cs
@@ -8,6 +8,7 @@ using System.Windows.Forms;
 using System.Threading.Tasks;
 using DirectShowLib;
 using DBObj;
+using OverlayFormObj;
 namespace DualScreenDemo
 {
     public class VideoPlayerForm : Form
@@ -1571,12 +1572,6 @@ namespace DualScreenDemo
                             DsUtils.FreeAMMediaType(mediaType);
                         }
                     }
-                    else
-                    {
-                    }
-                }
-                else
-                {
                 }
             }
             catch (Exception ex)