diff --git a/app/build.gradle b/app/build.gradle
index 0ffa78fe..c2a5db62 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -84,10 +84,6 @@ android {
         }
     }
 
-    lintOptions{
-        disable 'MissingTranslation'
-        disable 'RestrictedApi'
-    }
 
     android.applicationVariants.configureEach { variant ->
         variant.outputs.each { output ->
@@ -134,6 +130,14 @@ android {
         // Disables dependency metadata when building Android App Bundles.
         includeInBundle = false
     }
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging true
+        }
+    }
+    lint {
+        disable 'MissingTranslation', 'RestrictedApi'
+    }
 }
 
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8e4fce0d..da6f6d0a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,7 +32,6 @@
         android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|locale"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:enableOnBackInvokedCallback="true"
-        android:extractNativeLibs="true"
         android:icon="@mipmap/ic_launcher"
         android:label="YTDLnis"
         android:localeConfig="@xml/locales_config"
diff --git a/app/src/main/java/com/deniscerri/ytdl/util/VideoPlayerUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/VideoPlayerUtil.kt
index 5a05a15c..23dbd27a 100644
--- a/app/src/main/java/com/deniscerri/ytdl/util/VideoPlayerUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/util/VideoPlayerUtil.kt
@@ -3,42 +3,47 @@ package com.deniscerri.ytdl.util
 import android.content.Context
 import androidx.media3.common.AudioAttributes
 import androidx.media3.common.C
+import androidx.media3.common.PlaybackParameters
+import androidx.media3.datasource.DefaultDataSource
 import androidx.media3.exoplayer.DefaultLoadControl
 import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.exoplayer.source.DefaultMediaSourceFactory
 import androidx.media3.exoplayer.trackselection.DefaultTrackSelector
+import kotlin.math.max
 
 object VideoPlayerUtil {
+    private const val MINIMUM_BUFFER_DURATION = 1000 * 10 //exo default is 50s
+
     @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
     fun buildPlayer(context: Context) : ExoPlayer {
-        val player: ExoPlayer
-
+        val dataSourceFactory = DefaultDataSource.Factory(context)
+        val audioAttributes = AudioAttributes.Builder()
+            .setUsage(C.USAGE_MEDIA)
+            .setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
+            .build()
 
-        val trackSelector = DefaultTrackSelector(context)
         val loadControl = DefaultLoadControl.Builder()
             // cache the last three minutes
             .setBackBuffer(1000 * 60 * 3, true)
             .setBufferDurationsMs(
-                1000 * 10, // exo default is 50s
-                50000,
+                MINIMUM_BUFFER_DURATION,
+                max(50 * 1000, MINIMUM_BUFFER_DURATION),
                 DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS,
                 DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS
             )
             .build()
 
-        player = ExoPlayer.Builder(context)
+        return ExoPlayer.Builder(context)
             .setUsePlatformDiagnostics(false)
-            .setTrackSelector(trackSelector)
-            .setLoadControl(loadControl)
+            .setMediaSourceFactory(DefaultMediaSourceFactory(dataSourceFactory))
+            .setTrackSelector(DefaultTrackSelector(context))
             .setHandleAudioBecomingNoisy(true)
-            .setAudioAttributes(
-                AudioAttributes.Builder()
-                    .setUsage(C.USAGE_MEDIA)
-                    .setContentType(C.AUDIO_CONTENT_TYPE_MOVIE)
-                    .build()
-                ,
-                true)
+            .setLoadControl(loadControl)
+            .setAudioAttributes(audioAttributes, false)
             .build()
-
-        return player
+            .apply {
+                skipSilenceEnabled = false
+                playbackParameters = PlaybackParameters(1f, 1.0f)
+            }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt
index 8a4a036c..86ad751d 100644
--- a/app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/util/extractors/YTDLPUtil.kt
@@ -358,8 +358,6 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co
             request.applyDefaultOptionsForFetchingData(urls.firstOrNull { it.isURL() })
             if (urls.all { it.isYoutubeURL() }) {
                 request.setYoutubeExtractorArgs(urls[0])
-                request.addOption("--extractor-args", "youtube:player_skip=initial_data,webpage")
-                request.addOption("--extractor-args", "youtubetab:skip=webpage")
             }
             if (!request.hasOption("--no-check-certificates")) request.addOption("--no-check-certificates")
 
@@ -431,8 +429,6 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co
         request.applyDefaultOptionsForFetchingData(url)
         if (url.isYoutubeURL()) {
             request.setYoutubeExtractorArgs(url)
-            request.addOption("--extractor-args", "youtube:player_skip=initial_data,webpage")
-            request.addOption("--extractor-args", "youtubetab:skip=webpage")
         }
         if (!request.hasOption("--no-check-certificates")) request.addOption("--no-check-certificates")
 
diff --git a/app/src/main/java/com/deniscerri/ytdl/util/extractors/newpipe/NewPipeUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/extractors/newpipe/NewPipeUtil.kt
index 5fc2c30f..9907f276 100644
--- a/app/src/main/java/com/deniscerri/ytdl/util/extractors/newpipe/NewPipeUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/util/extractors/newpipe/NewPipeUtil.kt
@@ -134,9 +134,12 @@ class NewPipeUtil(context: Context) {
     fun getStreamingUrlAndChapters(url: String) : Result<Pair<List<String>, List<ChapterItem>?>> {
         try {
             val streamInfo = StreamInfo.getInfo(url)
-            val item = createVideoFromStream(streamInfo, url)
-            if (item!!.urls.isBlank()) return Result.failure(Throwable())
-            val urls = item.urls.split(",")
+            val item = createVideoFromStream(streamInfo, url)!!
+
+            val videoURL = item.formats.filter { it.vcodec.isNotBlank() && it.vcodec != "none" }.firstOrNull { !it.url.isNullOrBlank() }?.url ?: ""
+            val audioURL = item.formats.filter { it.vcodec.isBlank() || it.vcodec == "none" }.firstOrNull { !it.url.isNullOrBlank() }?.url ?: ""
+
+            val urls = listOf(videoURL, audioURL)
             val chapters = item.chapters
             return Result.success(Pair(urls, chapters))
         }catch (e: Exception) {