diff --git a/Hurricane/Hurricane.csproj b/Hurricane/Hurricane.csproj
index 6267a66..407b2be 100644
--- a/Hurricane/Hurricane.csproj
+++ b/Hurricane/Hurricane.csproj
@@ -33,7 +33,7 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
diff --git a/Hurricane/Music/Playlist/NormalPlaylist.cs b/Hurricane/Music/Playlist/NormalPlaylist.cs
index 4e57399..1ef2a6a 100644
--- a/Hurricane/Music/Playlist/NormalPlaylist.cs
+++ b/Hurricane/Music/Playlist/NormalPlaylist.cs
@@ -23,6 +23,8 @@ public override string Name
             }
         }
 
+        public DateTime TimeShuffeld { get; set; }
+
         public async Task AddFiles(IEnumerable<PlayableBase> tracks)
         {
             foreach (var track in tracks)
diff --git a/Hurricane/Music/Playlist/PlaylistBase.cs b/Hurricane/Music/Playlist/PlaylistBase.cs
index 9b675be..3df84d6 100644
--- a/Hurricane/Music/Playlist/PlaylistBase.cs
+++ b/Hurricane/Music/Playlist/PlaylistBase.cs
@@ -75,7 +75,12 @@ public virtual void LoadList()
                 };
                 ViewSource = CollectionViewSource.GetDefaultView(Tracks);
                 ViewSource.Filter = item => string.IsNullOrWhiteSpace(SearchText) || item.ToString().ToUpper().Contains(SearchText.ToUpper());
-                ShuffleList = new List<PlayableBase>(Tracks);
+                if (this is NormalPlaylist) {
+                    var timeShuffeld = ((NormalPlaylist)this).TimeShuffeld;
+                    ShuffleList = new List<PlayableBase>(Tracks.Where(track => track.LastTimePlayed<timeShuffeld));
+                } else {
+                    ShuffleList = new List<PlayableBase>(Tracks);
+                }
             }
         }
 
@@ -89,6 +94,9 @@ public virtual void LoadList()
         private bool _addedFavoriteTracksTwoTimes;
         protected void CreateShuffleList()
         {
+            if (this is NormalPlaylist) {
+                ((NormalPlaylist)this).TimeShuffeld = DateTime.Now;
+            }
             ShuffleList = new List<PlayableBase>(Tracks);
             if (HurricaneSettings.Instance.Config.ShufflePreferFavoriteTracks)
             {