diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index d788c66b..b39b0cf4 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2024-05-08T15:47:25.569848304Z">
+        <DropdownSelection timestamp="2024-06-18T13:18:37.192906330Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="Default" identifier="serial=127.0.0.1:6555;connection=b6ea1a45" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=7189098c0720" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7528d358..e8ff6b5a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,14 +5,12 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Gradle/gradle-8.1" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/kotlinYtmusicScraper" />
-            <option value="$PROJECT_DIR$/okhttp" />
           </set>
         </option>
         <option name="resolveExternalAnnotations" value="false" />
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/parser/PlaylistParser.kt b/app/src/main/java/com/maxrave/simpmusic/data/parser/PlaylistParser.kt
index 52f92e53..347bd042 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/parser/PlaylistParser.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/parser/PlaylistParser.kt
@@ -3,6 +3,7 @@ package com.maxrave.simpmusic.data.parser
 import android.content.Context
 import android.util.Log
 import com.maxrave.kotlinytmusicscraper.models.MusicShelfRenderer
+import com.maxrave.kotlinytmusicscraper.models.SectionListRenderer
 import com.maxrave.kotlinytmusicscraper.models.response.BrowseResponse
 import com.maxrave.kotlinytmusicscraper.models.response.SearchResponse
 import com.maxrave.kotlinytmusicscraper.pages.PodcastItem
@@ -72,6 +73,27 @@ fun parsePlaylistData(
             header.header.musicDetailHeaderRenderer.thumbnail.croppedSquareThumbnailRenderer?.thumbnail?.thumbnails?.toListThumbnail()
                 ?.let { listThumbnails.addAll(it) }
         }
+        else if (header is SectionListRenderer.Content.MusicResponsiveHeaderRenderer?) {
+            title += header.title?.runs?.firstOrNull()?.text
+            Log.d("PlaylistParser", "title: $title")
+            val author = Author(id = header.straplineTextOne?.runs?.get(0)?.navigationEndpoint?.browseEndpoint?.browseId ?: "", name = header.straplineTextOne?.runs?.get(0)?.text ?: "")
+            listAuthor.add(author)
+            Log.d("PlaylistParser", "author: $author")
+            if (header.secondSubtitle?.runs?.size!! > 4) {
+                duration += header.secondSubtitle?.runs?.get(4)?.text
+            }
+            else if (header.secondSubtitle?.runs?.size!! == 3) {
+                duration += header.secondSubtitle?.runs?.get(2)?.text
+            }
+            Log.d("PlaylistParser", "duration: $duration")
+            if (!header.description?.musicDescriptionShelfRenderer?.description?.runs.isNullOrEmpty()) {
+                for (run in header.description?.musicDescriptionShelfRenderer?.description?.runs!!) {
+                    description += (run.text)
+                }
+            }
+            header.thumbnail?.musicThumbnailRenderer?.thumbnail?.thumbnails?.toListThumbnail()
+                ?.let { listThumbnails.addAll(it) }
+        }
         Log.d("PlaylistParser", "description: $description")
         val listTrack: MutableList<Track> = arrayListOf()
         for (content in listContent){
diff --git a/app/src/main/java/com/maxrave/simpmusic/data/repository/MainRepository.kt b/app/src/main/java/com/maxrave/simpmusic/data/repository/MainRepository.kt
index ab5a2168..419fddf8 100644
--- a/app/src/main/java/com/maxrave/simpmusic/data/repository/MainRepository.kt
+++ b/app/src/main/java/com/maxrave/simpmusic/data/repository/MainRepository.kt
@@ -1091,6 +1091,9 @@ class MainRepository
                             )?.tabRenderer?.content?.sectionListRenderer?.contents?.get(
                                 0,
                             )?.musicPlaylistShelfRenderer?.contents
+                                ?: result.contents?.twoColumnBrowseResultsRenderer
+                                    ?.secondaryContents?.sectionListRenderer?.contents?.get(0)
+                                    ?.musicPlaylistShelfRenderer?.contents
                         if (data != null) {
                             Log.d("Data", "data: $data")
                             Log.d("Data", "data size: ${data.size}")
@@ -1099,6 +1102,9 @@ class MainRepository
                         val header =
                             result.header?.musicDetailHeaderRenderer
                                 ?: result.header?.musicEditablePlaylistDetailHeaderRenderer
+                                ?: result.contents?.twoColumnBrowseResultsRenderer?.tabs?.get(0)
+                                    ?.tabRenderer?.content?.sectionListRenderer?.contents?.get(0)
+                                    ?.musicResponsiveHeaderRenderer
                         Log.d("Header", "header: $header")
                         var continueParam =
                             result.contents?.singleColumnBrowseResultsRenderer?.tabs?.get(
@@ -1107,11 +1113,15 @@ class MainRepository
                                 0,
                             )?.musicPlaylistShelfRenderer?.continuations?.get(
                                 0,
-                            )?.nextContinuationData?.continuation
+                            )?.nextContinuationData?.continuation ?:
+                            result.contents?.twoColumnBrowseResultsRenderer?.secondaryContents?.sectionListRenderer?.contents?.firstOrNull()
+                                ?.musicPlaylistShelfRenderer?.continuations?.firstOrNull()?.nextContinuationData?.continuation
                         var count = 0
                         Log.d("Repository", "playlist data: ${listContent.size}")
                         Log.d("Repository", "continueParam: $continueParam")
-                        while (continueParam != null) {
+//                        else {
+//                            var listTrack = playlistBrowse.tracks.toMutableList()
+                            while (continueParam != null) {
                             YouTube.customQuery(
                                 browseId = "",
                                 continuation = continueParam,
@@ -1139,6 +1149,7 @@ class MainRepository
                             emit(Resource.Success<PlaylistBrowse>(playlist))
                         } ?: emit(Resource.Error<PlaylistBrowse>("Error"))
                     }.onFailure { e ->
+                        Log.e("Playlist Data", e.message ?: "Error")
                         emit(Resource.Error<PlaylistBrowse>(e.message.toString()))
                     }
                 }
diff --git a/gradle.properties b/gradle.properties
index 90de571b..ebbea09a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx4608m
+org.gradle.jvmargs=-Xmx4g
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5e1cf75d..6d22a528 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-android = "8.4.2"
+android = "8.5.0"
 kotlin = "1.9.23"
 serialization = "1.9.23"
 ksp = "1.9.23-1.0.19"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8787a53f..ba9da7ff 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/YouTube.kt b/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/YouTube.kt
index 8a4b45db..7185384f 100644
--- a/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/YouTube.kt
+++ b/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/YouTube.kt
@@ -917,57 +917,82 @@ object YouTube {
                     endpoint.params,
                     continuation,
                 ).body<NextResponse>()
+            Log.w("YouTube", response.toString())
             val playlistPanelRenderer =
                 response.continuationContents?.playlistPanelContinuation
-                    ?: response.contents.singleColumnMusicWatchNextResultsRenderer?.tabbedRenderer?.watchNextTabbedResultsRenderer?.tabs?.firstOrNull()?.tabRenderer?.content?.musicQueueRenderer?.content?.playlistPanelRenderer!!
-            // load automix items
-            if (playlistPanelRenderer.contents.lastOrNull()?.automixPreviewVideoRenderer?.content?.automixPlaylistVideoRenderer?.navigationEndpoint?.watchPlaylistEndpoint != null) {
-                return@runCatching next(
-                    playlistPanelRenderer.contents.lastOrNull()?.automixPreviewVideoRenderer?.content?.automixPlaylistVideoRenderer?.navigationEndpoint?.watchPlaylistEndpoint!!,
-                ).getOrThrow()
-                    .let { result ->
-                        result.copy(
-                            title = playlistPanelRenderer.title,
-                            items =
+                    ?: response.contents.singleColumnMusicWatchNextResultsRenderer?.tabbedRenderer?.watchNextTabbedResultsRenderer?.tabs?.firstOrNull()?.tabRenderer?.content?.musicQueueRenderer?.content?.playlistPanelRenderer
+            if (playlistPanelRenderer != null) {
+                // load automix items
+                if (playlistPanelRenderer.contents.lastOrNull()?.automixPreviewVideoRenderer?.content?.automixPlaylistVideoRenderer?.navigationEndpoint?.watchPlaylistEndpoint != null) {
+                    return@runCatching next(
+                        playlistPanelRenderer.contents.lastOrNull()?.automixPreviewVideoRenderer?.content?.automixPlaylistVideoRenderer?.navigationEndpoint?.watchPlaylistEndpoint!!,
+                    ).getOrThrow()
+                        .let { result ->
+                            result.copy(
+                                title = playlistPanelRenderer.title,
+                                items =
                                 playlistPanelRenderer.contents.mapNotNull {
                                     it.playlistPanelVideoRenderer?.let { renderer ->
                                         NextPage.fromPlaylistPanelVideoRenderer(renderer)
                                     }
                                 } + result.items,
-                            lyricsEndpoint =
+                                lyricsEndpoint =
                                 response.contents.singleColumnMusicWatchNextResultsRenderer?.tabbedRenderer?.watchNextTabbedResultsRenderer?.tabs?.getOrNull(
                                     1,
                                 )?.tabRenderer?.endpoint?.browseEndpoint,
-                            relatedEndpoint =
+                                relatedEndpoint =
                                 response.contents.singleColumnMusicWatchNextResultsRenderer?.tabbedRenderer?.watchNextTabbedResultsRenderer?.tabs?.getOrNull(
                                     2,
                                 )?.tabRenderer?.endpoint?.browseEndpoint,
-                            currentIndex = playlistPanelRenderer.currentIndex,
-                            endpoint = playlistPanelRenderer.contents.lastOrNull()?.automixPreviewVideoRenderer?.content?.automixPlaylistVideoRenderer?.navigationEndpoint?.watchPlaylistEndpoint!!,
-                        )
-                    }
-            }
+                                currentIndex = playlistPanelRenderer.currentIndex,
+                                endpoint = playlistPanelRenderer.contents.lastOrNull()?.automixPreviewVideoRenderer?.content?.automixPlaylistVideoRenderer?.navigationEndpoint?.watchPlaylistEndpoint!!,
+                            )
+                        }
+                }
 //        else if (playlistPanelRenderer.contents.firstOrNull()?.playlistPanelVideoRenderer?.navigationEndpoint?.watchPlaylistEndpoint != null) {
 //
 //        }
-            NextResult(
-                title = playlistPanelRenderer.title,
-                items =
+                return@runCatching NextResult(
+                    title = playlistPanelRenderer.title,
+                    items =
                     playlistPanelRenderer.contents.mapNotNull {
                         it.playlistPanelVideoRenderer?.let(NextPage::fromPlaylistPanelVideoRenderer)
                     },
-                currentIndex = playlistPanelRenderer.currentIndex,
-                lyricsEndpoint =
+                    currentIndex = playlistPanelRenderer.currentIndex,
+                    lyricsEndpoint =
                     response.contents.singleColumnMusicWatchNextResultsRenderer?.tabbedRenderer?.watchNextTabbedResultsRenderer?.tabs?.getOrNull(
                         1,
                     )?.tabRenderer?.endpoint?.browseEndpoint,
-                relatedEndpoint =
+                    relatedEndpoint =
                     response.contents.singleColumnMusicWatchNextResultsRenderer?.tabbedRenderer?.watchNextTabbedResultsRenderer?.tabs?.getOrNull(
                         2,
                     )?.tabRenderer?.endpoint?.browseEndpoint,
-                continuation = playlistPanelRenderer.continuations?.getContinuation(),
-                endpoint = endpoint,
-            )
+                    continuation = playlistPanelRenderer.continuations?.getContinuation(),
+                    endpoint = endpoint,
+                )
+            }
+            else {
+                Log.e("YouTube", response.toString())
+                val musicPlaylistShelfContinuation = response.continuationContents?.musicPlaylistShelfContinuation!!
+                return@runCatching NextResult(
+                    items = musicPlaylistShelfContinuation.contents.mapNotNull {
+                        it.musicResponsiveListItemRenderer?.let { renderer ->
+                            NextPage.fromMusicResponsiveListItemRenderer(renderer)
+                        }
+                    },
+                    continuation = musicPlaylistShelfContinuation.continuations?.firstOrNull()?.nextContinuationData?.continuation,
+                    endpoint = WatchEndpoint(
+                        videoId = null,
+                        playlistId = null,
+                        playlistSetVideoId = null,
+                        params = null,
+                        index = null,
+                        watchEndpointMusicSupportedConfigs = null
+                    )
+
+                )
+            }
+
         }
 
     suspend fun lyrics(endpoint: BrowseEndpoint): Result<String?> =
diff --git a/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/models/SectionListRenderer.kt b/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/models/SectionListRenderer.kt
index e8b163bb..7cd13c18 100644
--- a/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/models/SectionListRenderer.kt
+++ b/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/models/SectionListRenderer.kt
@@ -53,6 +53,7 @@ data class SectionListRenderer(
             val straplineThumbnail: StraplineThumbnail?,
             val thumbnail: ThumbnailRenderer?,
             val title: Title?,
+            val secondSubtitle: MusicShelfRenderer.Content.MusicMultiRowListItemRenderer.Subtitle?
         ) {
             @Serializable
             data class Description(
diff --git a/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/models/response/NextResponse.kt b/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/models/response/NextResponse.kt
index d5efe3b8..e24af27a 100644
--- a/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/models/response/NextResponse.kt
+++ b/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/models/response/NextResponse.kt
@@ -35,6 +35,8 @@ data class NextResponse(
 
     @Serializable
     data class ContinuationContents(
-        val playlistPanelContinuation: PlaylistPanelRenderer,
+        val playlistPanelContinuation: PlaylistPanelRenderer?,
+        val sectionListContinuation: BrowseResponse.ContinuationContents.SectionListContinuation?,
+        val musicPlaylistShelfContinuation: BrowseResponse.ContinuationContents.MusicPlaylistShelfContinuation?
     )
 }
diff --git a/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/pages/NextPage.kt b/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/pages/NextPage.kt
index 2e7992e2..29536281 100644
--- a/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/pages/NextPage.kt
+++ b/kotlinYtmusicScraper/src/main/java/com/maxrave/kotlinytmusicscraper/pages/NextPage.kt
@@ -3,6 +3,7 @@ package com.maxrave.kotlinytmusicscraper.pages
 import com.maxrave.kotlinytmusicscraper.models.Album
 import com.maxrave.kotlinytmusicscraper.models.Artist
 import com.maxrave.kotlinytmusicscraper.models.BrowseEndpoint
+import com.maxrave.kotlinytmusicscraper.models.MusicResponsiveListItemRenderer
 import com.maxrave.kotlinytmusicscraper.models.PlaylistPanelVideoRenderer
 import com.maxrave.kotlinytmusicscraper.models.SongItem
 import com.maxrave.kotlinytmusicscraper.models.WatchEndpoint
@@ -21,6 +22,37 @@ data class NextResult(
 )
 
 object NextPage {
+    fun fromMusicResponsiveListItemRenderer(renderer: MusicResponsiveListItemRenderer): SongItem? {
+        val videoId = renderer.playlistItemData?.videoId ?: return null
+        val artistRuns = renderer.flexColumns.getOrNull(1)?.musicResponsiveListItemFlexColumnRenderer?.
+            text?.runs?.oddElements() ?: return null
+        val albumRuns = renderer.flexColumns.getOrNull(2)?.musicResponsiveListItemFlexColumnRenderer?.text
+            ?.runs?.firstOrNull()
+        return SongItem(
+            id = videoId,
+            title = renderer.flexColumns.firstOrNull()?.musicResponsiveListItemFlexColumnRenderer
+                ?.text?.runs?.firstOrNull()?.text ?: return null,
+            artists = artistRuns.map {
+                Artist(
+                    name = it.text,
+                    id = it.navigationEndpoint?.browseEndpoint?.browseId
+                )
+            },
+            album = albumRuns?.let {
+                Album(
+                    name = it.text,
+                    id = it.navigationEndpoint?.browseEndpoint?.browseId ?: ""
+                )
+            },
+            duration = renderer.fixedColumns?.firstOrNull()?.musicResponsiveListItemFlexColumnRenderer
+                ?.text?.runs?.firstOrNull()?.text?.parseTime(),
+            thumbnail = renderer.thumbnail?.musicThumbnailRenderer?.getThumbnailUrl() ?: "",
+            explicit = false,
+            endpoint = renderer.flexColumns.firstOrNull()?.musicResponsiveListItemFlexColumnRenderer
+                ?.text?.runs?.firstOrNull()?.navigationEndpoint?.watchEndpoint,
+            thumbnails = renderer.thumbnail?.musicThumbnailRenderer?.thumbnail
+        )
+    }
     fun fromPlaylistPanelVideoRenderer(renderer: PlaylistPanelVideoRenderer): SongItem? {
         val longByLineRuns = renderer.longBylineText?.runs?.splitBySeparator() ?: return null
         return SongItem(
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 389dda64..10b0e017 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -21,5 +21,4 @@ dependencyResolutionManagement {
 }
 rootProject.name = "SimpMusic"
 include("app")
-include(":kotlinYtmusicScraper")
-include(":okhttp")
\ No newline at end of file
+include(":kotlinYtmusicScraper")
\ No newline at end of file