diff --git a/PrimaryFormParts/PrimaryForm.SyncScreen.cs b/PrimaryFormParts/PrimaryForm.SyncScreen.cs
index 16b577d..46777c9 100644
--- a/PrimaryFormParts/PrimaryForm.SyncScreen.cs
+++ b/PrimaryFormParts/PrimaryForm.SyncScreen.cs
@@ -132,6 +132,7 @@ namespace DualScreenDemo
             this.ClientSize = new System.Drawing.Size(1440, 900); 
             this.Controls.Add(this.primaryScreenPanel);
             this.primaryScreenPanel.Controls.Add(this.videoPanel);
+            videoPanel.Controls.Add(videoView0);
             this.Controls.Add(this.syncCloseButton);
             this.Name = "PrimaryForm";
             this.ResumeLayout(false);
diff --git a/PrimaryFormParts/PrimaryForm.cs b/PrimaryFormParts/PrimaryForm.cs
index 848d9e5..c8e7b8a 100644
--- a/PrimaryFormParts/PrimaryForm.cs
+++ b/PrimaryFormParts/PrimaryForm.cs
@@ -11,6 +11,7 @@ using IniParser;
 using System.Text;
 using System.Net.Http;
 using System.Threading.Tasks;
+using LibVLCSharp.WinForms;
 
 
 namespace DualScreenDemo
@@ -129,6 +130,8 @@ namespace DualScreenDemo
         private List<Label> songLabels = new List<Label>();
         private int _currentPage { get; set; } = 0;
         private int _totalPages { get; set; }
+        public VideoView videoView0 = new VideoView() { Dock = DockStyle.Fill};
+        public VideoView videoView1 = new VideoView() { Dock = DockStyle.Fill};
 
         // string serverPath = Utils.Env.GetPath("", "");
         string serverPath = Application.StartupPath;
@@ -207,7 +210,7 @@ namespace DualScreenDemo
         private Timer autoRefreshTimer;
         private Timer timerCountdown;
         string Rtime;
-        bool test = false;
+        bool test = true;
         //private Label pageNumberLabel; // 添加頁碼標籤
         public PrimaryForm()
         {
diff --git a/Services/MediaService.cs b/Services/MediaService.cs
index 4301f9a..497a9bc 100644
--- a/Services/MediaService.cs
+++ b/Services/MediaService.cs
@@ -3,6 +3,27 @@ using LibVLCSharp.Shared;
 
 namespace DualScreenDemo.Services
 {
+    public static class ControlExtensions
+    {
+        public static Task InvokeAsync(this Control control, Func<Task> func)
+        {
+            var tcs = new TaskCompletionSource<object>();
+            control.BeginInvoke(new Action(async () =>
+            {
+                try
+                {
+                    await func();
+                    tcs.SetResult(null);
+                }
+                catch (Exception ex)
+                {
+                    tcs.SetException(ex);
+                }
+            }));
+            return tcs.Task;
+        }
+    }
+
     public class MediaService : IDisposable
     {
         private LibVLC _libVLC;
@@ -14,17 +35,24 @@ namespace DualScreenDemo.Services
         {
             Core.Initialize();
             _libVLC = new LibVLC(
-                 "--verbose=-1",
+                //  "--verbose=-1",
+                 enableDebugLogs: true,
                 "--audio-time-stretch",
                 "--vout=automatic",
                 "--h264-fps=30",
                 "--aout=directsound",
-                "--network-caching=300",
-                "--file-caching=300",
+                //  "--network-caching=300",
+                //  "--file-caching=300",
                 "--audio-time-stretch"
             );
 
+            _libVLC.Log += (sender, args) =>
+            {
+                Console.WriteLine($"[{args.Level}] {args.Message}");
+            };
+
             _mediaPlayer = new MediaPlayer(_libVLC);
+            _mediaPlayer.AspectRatio = "16:9";
             _mediaPlayer.EnableHardwareDecoding = true;
         }
 
@@ -58,15 +86,51 @@ namespace DualScreenDemo.Services
             }
             return false;
         }
+        
+        public bool IsAtEndTime()
+        {
+            var duration = _mediaPlayer.Media?.Duration ?? 0;
+            var time = _mediaPlayer.Time;
+            return duration > 0 && Math.Abs(duration - time) < 1000;
+        }
 
-        public void LoadMedia(string filePath,int audioTrackIndex = 0)
+        private bool _isTransitioning = false;
+
+
+
+
+        public void LoadMedia(string filePath, int audioTrackIndex = 0)
         {
             try
             {
-                _mediaPlayer.Stop();
+                // _mediaPlayer.Stop();
                 _media?.Dispose();
                 _media = new Media(_libVLC, filePath, FromType.FromPath);
-                _mediaPlayer.Media = addMediaOption(_media, audioTrackIndex);
+                _mediaPlayer.Play(addMediaOption(_media, audioTrackIndex));
+                _mediaPlayer.Stopped += (s, e) => Console.WriteLine("Player Stopped");
+
+                // _mediaPlayer.EndReached += async(s, e) =>
+                // {
+                //     if (_isTransitioning) return;
+                //     _isTransitioning = true;
+
+                //     try
+                //     {
+                //         await VideoPlayerForm.Instance.InvokeAsync(async () =>
+                //         {
+                //             await VideoPlayerForm.Instance.PlayNextSong();
+                //             await Task.Delay(2000); // Optional delay
+                //         });
+                //     }
+                //     catch (Exception ex)
+                //     {
+                //         Console.WriteLine($"Error during transition: {ex.Message}");
+                //     }
+                //     finally
+                //     {
+                //         _isTransitioning = false;
+                //     }
+                // };
             }
             catch (Exception ex)
             {
@@ -80,6 +144,9 @@ namespace DualScreenDemo.Services
             media.AddOption(":avcodec-hw=dxva2");
             media.AddOption($":drop-late-frames");
             media.AddOption(":audio-output=directsound");
+            media.AddOption(":network-caching=300");
+            media.AddOption(":live-caching=300");
+            media.AddOption(":file-caching=300");
             media.AddOption($":audio-track={audioTrackIndex}");
             return media;
         }
diff --git a/VideoPlayerForm.cs b/VideoPlayerForm.cs
index afb75bb..6c48d57 100644
--- a/VideoPlayerForm.cs
+++ b/VideoPlayerForm.cs
@@ -2,6 +2,7 @@ using System.Runtime.InteropServices;
 using DBObj;
 using OverlayFormObj;
 using DualScreenDemo.Services;
+using LibVLCSharp.WinForms;
 namespace DualScreenDemo
 {
     public class VideoPlayerForm : Form
@@ -69,6 +70,7 @@ namespace DualScreenDemo
         private MediaService _mediaService0 = new MediaService();
         private MediaService _mediaService1 = new MediaService();
 
+
         public static OverlayForm overlayForm;
         public bool isMuted = false;
         public int previousVolume = 100;
@@ -120,8 +122,11 @@ namespace DualScreenDemo
             }
             else
             {
-                _mediaService0.SetVideoOutput(PrimaryForm.Instance.videoPanel.Handle, PrimaryForm.Instance.videoPanel.Width, PrimaryForm.Instance.videoPanel.Height);
-                _mediaService1.SetVideoOutput(this.Handle, secondMonitor.Bounds.Width, secondMonitor.Bounds.Height);
+                // _mediaService0.SetVideoOutput(PrimaryForm.Instance.videoPanel.Handle, PrimaryForm.Instance.videoPanel.Width, PrimaryForm.Instance.videoPanel.Height);
+                //_mediaService1.SetVideoOutput(this.Handle, secondMonitor.Bounds.Width, secondMonitor.Bounds.Height);
+                this.Controls.Add(PrimaryForm.Instance.videoView1);
+                PrimaryForm.Instance.videoView1.MediaPlayer = _mediaService1.Player;
+                PrimaryForm.Instance.videoView0.MediaPlayer = _mediaService0.Player;
                 PlayNextSong();
             }
         }
@@ -344,13 +349,15 @@ namespace DualScreenDemo
                 string pathToPlay = song.getFile();
                 _mediaService0.LoadMedia(pathToPlay, 0);
                 _mediaService1.LoadMedia(pathToPlay, song.isPublicSong ? 0 : 1);
-                Play();
+                // Play();
                 // Thread.Sleep(100);
-                PrimaryForm.Instance.muteButton.PerformClick();
-                PrimaryForm.Instance.muteButton.PerformClick();
-                // 音量處理
+
+                // isVocalRemoved = true;
                 Mute(isMuted);
+                // 音量處理
                 SetVolume(100 + song.getBasic().getDbChange());
+                Task.Run(() => Thread.Sleep(100));
+                Console.WriteLine(_mediaService1.GetVolume());
                 if (isSyncToPrimaryMonitor) SyncToPrimaryMonitor();
                 return Task.CompletedTask;
             }
@@ -396,7 +403,7 @@ namespace DualScreenDemo
                 {
                     try
                     {
-                        if (_mediaService1.IsAtEnd()&&_mediaService0.IsAtEnd())
+                        if (_mediaService1.IsAtEndTime())
                         {
                             BeginInvoke(new Action(async () =>
                             {