diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 4561253..69523f7 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-07-27T17:35:42.676944300Z">
+        <DropdownSelection timestamp="2024-07-28T21:36:53.323557Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\gabil\.android\avd\Pixel_7_Pro_API_34.avd" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=78adaad4" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/com/bobbyesp/metadator/presentation/Navigation.kt b/app/src/main/java/com/bobbyesp/metadator/presentation/Navigation.kt
index 3d7d6f5..6fd4614 100644
--- a/app/src/main/java/com/bobbyesp/metadator/presentation/Navigation.kt
+++ b/app/src/main/java/com/bobbyesp/metadator/presentation/Navigation.kt
@@ -332,7 +332,7 @@ fun Navigator() {
                             animatedComposable<Route.MetadatorNavigator.Home> {
                                 val songsState =
                                     mediaStoreViewModel.songs.collectAsStateWithLifecycle()
-                                HomePage(songs = songsState)
+                                HomePage(songs = songsState, onEvent = mediaStoreViewModel::onEvent)
                             }
                         }
 
diff --git a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/MediaStoreViewModel.kt b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/MediaStoreViewModel.kt
index 51460db..1615e17 100644
--- a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/MediaStoreViewModel.kt
+++ b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/MediaStoreViewModel.kt
@@ -1,6 +1,7 @@
 package com.bobbyesp.metadator.presentation.pages
 
 import android.content.Context
+import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.bobbyesp.utilities.mediastore.MediaStoreReceiver.Advanced.observeSongs
@@ -27,20 +28,31 @@ class MediaStorePageViewModel @Inject constructor(
     private val mediaStoreSongsFlow =
         applicationContext.contentResolver.observeSongs()
 
-    init {
+    fun reloadMediaStore() {
         viewModelScope.launch(Dispatchers.IO) {
+            _songs.update { ResourceState.Loading() }
             mediaStoreSongsFlow.collectLatest { songs ->
                 _songs.update { ResourceState.Success(songs) }
             }
         }
     }
 
-    fun reloadMediaStore() {
-        viewModelScope.launch(Dispatchers.IO) {
-            _songs.update { ResourceState.Loading() }
-            mediaStoreSongsFlow.collectLatest { songs ->
-                _songs.update { ResourceState.Success(songs) }
+    fun onEvent(event: Events) {
+        when (event) {
+            is Events.StartObservingMediaStore -> {
+                Log.i("MediaStorePageViewModel", "Start observing media store")
+                viewModelScope.launch(Dispatchers.IO) {
+                    mediaStoreSongsFlow.collectLatest { songs ->
+                        _songs.update { ResourceState.Success(songs) }
+                    }
+                }
             }
         }
     }
+
+    companion object {
+        interface Events {
+            data object StartObservingMediaStore : Events
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/home/HomePage.kt b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/home/HomePage.kt
index b6fa4ab..62b7ed6 100644
--- a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/home/HomePage.kt
+++ b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/home/HomePage.kt
@@ -34,6 +34,7 @@ import androidx.compose.material3.SegmentedButtonDefaults
 import androidx.compose.material3.SingleChoiceSegmentedButtonRow
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -57,6 +58,7 @@ import com.bobbyesp.metadator.presentation.common.LocalDrawerState
 import com.bobbyesp.metadator.presentation.common.LocalNavController
 import com.bobbyesp.metadator.presentation.common.Route
 import com.bobbyesp.metadator.presentation.pages.MediaStorePage
+import com.bobbyesp.metadator.presentation.pages.MediaStorePageViewModel
 import com.bobbyesp.ui.components.dropdown.AnimatedDropdownMenu
 import com.bobbyesp.ui.components.dropdown.DropdownItemContainer
 import com.bobbyesp.ui.components.text.AutoResizableText
@@ -69,25 +71,33 @@ import com.bobbyesp.utilities.ui.permission.PermissionRequestHandler
 import com.bobbyesp.utilities.ui.permission.toPermissionType
 import com.bobbyesp.utilities.ui.rememberForeverLazyGridState
 import com.google.accompanist.permissions.ExperimentalPermissionsApi
+import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
+import kotlinx.collections.immutable.toImmutableList
 import kotlinx.coroutines.launch
-import okhttp3.internal.toImmutableList
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalPermissionsApi::class)
 @Composable
 fun HomePage(
-    modifier: Modifier = Modifier, songs: State<ResourceState<List<Song>>>
+    modifier: Modifier = Modifier,
+    songs: State<ResourceState<List<Song>>>,
+    onEvent: (MediaStorePageViewModel.Companion.Events) -> Unit = {}
 ) {
     val context = LocalContext.current as Activity
-    val currentApiVersion = Build.VERSION.SDK_INT
     val readAudioFiles = when {
-        currentApiVersion < Build.VERSION_CODES.TIRAMISU -> Manifest.permission.READ_EXTERNAL_STORAGE
+        Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU -> Manifest.permission.READ_EXTERNAL_STORAGE
 
         else -> Manifest.permission.READ_MEDIA_AUDIO
     }
 
     val storagePermissionState = rememberPermissionState(permission = readAudioFiles)
 
+    LaunchedEffect(storagePermissionState.status.isGranted) {
+        if (storagePermissionState.status.isGranted && songs.value !is ResourceState.Success) {
+            onEvent(MediaStorePageViewModel.Companion.Events.StartObservingMediaStore)
+        }
+    }
+
     val navController = LocalNavController.current
     val drawerState = LocalDrawerState.current
     val scope = rememberCoroutineScope()
@@ -210,10 +220,9 @@ fun HomePage(
                 }
             }
         }
-        //for scrolling up to the top
-
     }) { paddingValues ->
-        PermissionRequestHandler(permissionState = storagePermissionState,
+        PermissionRequestHandler(
+            permissionState = storagePermissionState,
             deniedContent = { shouldShowRationale ->
                 PermissionNotGrantedDialog(
                     neededPermissions = listOf(readAudioFiles.toPermissionType()),
diff --git a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/rework/MetadataEditorVM.kt b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/rework/MetadataEditorVM.kt
index b53bc3c..a31a0ec 100644
--- a/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/rework/MetadataEditorVM.kt
+++ b/app/src/main/java/com/bobbyesp/metadator/presentation/pages/utilities/tageditor/rework/MetadataEditorVM.kt
@@ -54,7 +54,7 @@ class MetadataEditorVM @Inject constructor(
         val mutablePropertiesMap: SnapshotStateMap<String, String> = mutableStateMapOf()
     )
 
-    suspend fun loadTrackMetadata(path: String) {
+    private suspend fun loadTrackMetadata(path: String) {
         updateState(ScreenState.Loading)
         mutableState.value.mutablePropertiesMap.clear()
         runCatching {
@@ -103,7 +103,7 @@ class MetadataEditorVM @Inject constructor(
         }
     }
 
-    suspend fun loadAudioMetadata(songFd: ParcelFileDescriptor): Metadata? {
+    private suspend fun loadAudioMetadata(songFd: ParcelFileDescriptor): Metadata? {
         val fd = songFd.dup()?.detachFd()
             ?: throw NullAudioFileDescriptorException(isAudioProperties = false)
 
@@ -113,7 +113,7 @@ class MetadataEditorVM @Inject constructor(
     }
 
 
-    suspend fun loadAudioProperties(
+    private suspend fun loadAudioProperties(
         songFd: ParcelFileDescriptor,
         readStyle: AudioPropertiesReadStyle = AudioPropertiesReadStyle.Average
     ): AudioProperties? {
@@ -160,7 +160,7 @@ class MetadataEditorVM @Inject constructor(
         }
     }
 
-    fun savePictures(
+    private fun savePictures(
         context: Context = this.context,
         imagesUri: List<Uri> = emptyList(),
         audioPath: String,
@@ -180,8 +180,8 @@ class MetadataEditorVM @Inject constructor(
                     val picture = Picture(
                         data = byteArray,
                         mimeType = mimeType,
-                        description = "Song image $index - Metadator",
-                        pictureType = "Cover (front)"
+                        description = "Audio image $index - Metadator",
+                        pictureType = "Front cover"
                     )
 
                     mutablePicturesList.add(picture)
@@ -223,8 +223,8 @@ class MetadataEditorVM @Inject constructor(
             val picture = Picture(
                 data = byteArray,
                 mimeType = mimeType,
-                description = "Song cover - Metadator",
-                pictureType = "Cover (front)"
+                description = "Audio image $index - Metadator",
+                pictureType = "Front cover"
             )
 
             mutablePicturesList.add(picture)
@@ -276,7 +276,7 @@ class MetadataEditorVM @Inject constructor(
         }
     }
 
-    fun emitUiEvent(event: UiEvent) {
+    private fun emitUiEvent(event: UiEvent) {
         viewModelScope.launch {
             _eventFlow.emit(event)
         }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index a06dbf5..d95bc22 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -55,7 +55,7 @@ hilt-ext = "1.2.0"
 room = "2.6.1"
 
 #High performance Key-value storage
-mmkv = "1.3.6"
+mmkv = "1.3.9"
 
 #Firebase, GMS...
 firebaseAuth = "23.0.0"