diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
index f8b2f98..58cf01f 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/DashboardActivity.kt
@@ -146,7 +146,7 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
     }
 
     private fun downloadApk(responseBody: ResponseBody) {
-        val file = File(getExternalFilesDir(null), "update.apk")
+        val file = File(getExternalFilesDir(null), "Update.apk")
         var inputStream: InputStream? = null
         var outputStream: FileOutputStream? = null
         try {
@@ -245,9 +245,9 @@ class DashboardActivity : AppCompatActivity(), IDataCollector {
 
         responses = responses+response+"\n"
         println(responses)
-        if (response.contains("checkUpdate")) {
-            hemocubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
-        }
+//        if (response.contains("checkUpdate")) {
+//            hemocubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
+//        }
     }
 
     private fun createDeviceUpdateRequestData(): DeviceUpdateRequest {
diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
index b71e0d9..9847f44 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt
@@ -253,11 +253,11 @@ class HomeFragment : Fragment() {
                     hemoCubeViewModel.login(createLoginRequestData(userID, password))
                 } else {
                     isTokenAvailable = true
-
-                    hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
                     hemoCubeViewModel.uploadLogs()
                     hemoCubeViewModel.startPeriodicCheckUpdate()
                     hemoCubeViewModel.downloadClientCertificate()
+                    hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
+
                 }
             }
         } else if (deviceId.isNotEmpty()) {
@@ -271,9 +271,9 @@ class HomeFragment : Fragment() {
             } else {
                 // Continue with your existing logic if the token is not empty.
                 isTokenAvailable = true
-                hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
                 hemoCubeViewModel.uploadLogs()
                 hemoCubeViewModel.startPeriodicCheckUpdate()
+                hemoCubeViewModel.checkUpdate(createCheckUpdateRequestData())
             }
         } else {
             Toast.makeText(
@@ -337,6 +337,40 @@ class HomeFragment : Fragment() {
             }
         }
 
+        hemoCubeViewModel.checkUpdate.observe(viewLifecycleOwner) { response ->
+            when (response) {
+                is Result.Success -> {
+                    // Handle success
+                    val apkUrl = response.data
+                    Log.e("ApI", "APK URL: $apkUrl")
+                    hemoCubeViewModel.deviceUpdate(createDeviceUpdateRequestData())
+                    Toast.makeText(
+                        activity,
+                        " ${response.data}",
+                        Toast.LENGTH_LONG
+                    )
+                        .show()
+                }
+
+                is Result.Error -> {
+                    response.exception.let { message ->
+                        Toast.makeText(
+                            activity,
+                            "An error occurred in uploading logs: $message",
+                            Toast.LENGTH_LONG
+                        )
+                            .show()
+                    }
+                }
+
+                is Result.Loading -> {
+                }
+
+                else -> {
+                }
+            }
+        }
+
         hemoCubeViewModel.downloadcertificate.observe(viewLifecycleOwner) { response ->
             when (response) {
                 is Result.Success -> {
diff --git a/app/src/main/res/xml/file_paths.xml b/app/src/main/res/xml/file_paths.xml
index 6e9c380..72a05d1 100644
--- a/app/src/main/res/xml/file_paths.xml
+++ b/app/src/main/res/xml/file_paths.xml
@@ -1,3 +1,3 @@
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
-    <external-files-path name="Updates" path="." />
+    <external-files-path name="Update" path="." />
 </paths>