diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/api/InputPanApi.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/api/InputPanApi.kt
index 39f823bc4d..2bcb1014d5 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/api/InputPanApi.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/api/InputPanApi.kt
@@ -7,11 +7,13 @@ import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.PATCH
 import retrofit2.http.POST
+import retrofit2.http.Path
 
-private const val BASE_URL = "https://auth-service.np.navi-tech.in"
+//private const val BASE_URL = "https://auth-service.np.navi-tech.in"
+private const val BASE_URL = "https://5ab1dd15-c349-4724-8da6-45c72a7d7219.mock.pstmn.io"
 
 interface InputPanApi {
-    @PATCH("/party/persons/:id/POI")
+    @PATCH("/loan-origination-manager/loan-applications/{loan-application-id}/POI")
     suspend fun submitPan(@Body inputPanRequest: InputPanRequest): Response<InputPanResponse>
 
     companion object {
diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/api/LoanApplicationApi.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/api/LoanApplicationApi.kt
index 8224c5384d..c532e24e42 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/api/LoanApplicationApi.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/api/LoanApplicationApi.kt
@@ -9,7 +9,8 @@ import com.navi.medici.androidCustomerApp.models.response.OfferAcceptResponse
 import retrofit2.Response
 import retrofit2.http.*
 
-private const val BASE_URL = "https://loan-origination-service.np.navi-tech.in"
+//private const val BASE_URL = "https://loan-origination-service.np.navi-tech.in"
+private const val BASE_URL = "https://5ab1dd15-c349-4724-8da6-45c72a7d7219.mock.pstmn.io"
 //private const val BASE_URL = "http://192.168.31.220:3020"
 interface LoanApplicationApi {
     @PUT("/los/apply-loan")
diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/api/LoginApi.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/api/LoginApi.kt
index 218ee5385d..a13e1919ef 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/api/LoginApi.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/api/LoginApi.kt
@@ -7,7 +7,8 @@ import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.POST
 
-private const val BASE_URL = "https://auth-service.np.navi-tech.in"
+//private const val BASE_URL = "https://auth-service.np.navi-tech.in"
+private const val BASE_URL = "https://5ab1dd15-c349-4724-8da6-45c72a7d7219.mock.pstmn.io"
 //private const val BASE_URL = "http://192.168.31.220:3020"
 
 interface LoginApi {
diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/api/MyLoansApi.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/api/MyLoansApi.kt
index 21435b891c..e0c6ec2d4b 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/api/MyLoansApi.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/api/MyLoansApi.kt
@@ -6,7 +6,8 @@ import retrofit2.Response
 import retrofit2.http.GET
 import retrofit2.http.Query
 
-private const val BASE_URL = "https://loan-accounts-service.np.navi-tech.in"
+private const val BASE_URL = "https://5ab1dd15-c349-4724-8da6-45c72a7d7219.mock.pstmn.io"
+//private const val BASE_URL = "https://loan-accounts-service.np.navi-tech.in"
 //private const val BASE_URL = "http://192.168.31.220:3020"
 
 interface MyLoansApi {
diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/api/OtpApi.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/api/OtpApi.kt
index 13baf5d1be..07bb834b72 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/api/OtpApi.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/api/OtpApi.kt
@@ -7,7 +7,8 @@ import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.POST
 
-private const val BASE_URL = "https://auth-service.np.navi-tech.in"
+private const val BASE_URL = "https://5ab1dd15-c349-4724-8da6-45c72a7d7219.mock.pstmn.io"
+//private const val BASE_URL = "https://auth-service.np.navi-tech.in"
 //private const val BASE_URL = "http://192.168.31.220:3020"
 
 interface OtpApi {
diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/api/RegisterApi.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/api/RegisterApi.kt
index 6d53151f75..79a4a108d0 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/api/RegisterApi.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/api/RegisterApi.kt
@@ -7,8 +7,10 @@ import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.PUT
 
-private const val BASE_URL = "https://auth-service.np.navi-tech.in"
+//private const val BASE_URL = "https://auth-service.np.navi-tech.in"
 //private const val BASE_URL = "http://192.168.31.220:3020"
+private const val BASE_URL = "https://5ab1dd15-c349-4724-8da6-45c72a7d7219.mock.pstmn.io"
+
 interface RegisterApi {
     @PUT("/auth/app-installations/register")
     suspend fun checkDevice(@Body registerRequest: RegisterRequest): Response<RegisterResponse>
@@ -16,7 +18,8 @@ interface RegisterApi {
     companion object {
         operator fun invoke(): RegisterApi {
             return RetrofitService.build(BASE_URL).create(
-                RegisterApi::class.java)
+                RegisterApi::class.java
+            )
         }
     }
 }
diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/api/UploadPanApi.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/api/UploadPanApi.kt
index da22f089f7..0e30105235 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/api/UploadPanApi.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/api/UploadPanApi.kt
@@ -9,7 +9,8 @@ import retrofit2.http.POST
 import retrofit2.http.Part
 import okhttp3.MultipartBody
 
-private const val BASE_URL = "https://auth-service.np.navi-tech.in"
+private const val BASE_URL = "https://5ab1dd15-c349-4724-8da6-45c72a7d7219.mock.pstmn.io"
+//private const val BASE_URL = "https://auth-service.np.navi-tech.in"
 
 interface UploadPanApi {
     @Multipart
diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/preferences/PreferenceManager.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/preferences/PreferenceManager.kt
index 8954f643da..ffc03774bb 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/preferences/PreferenceManager.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/preferences/PreferenceManager.kt
@@ -2,6 +2,8 @@ package com.navi.medici.androidCustomerApp.preferences
 
 import android.app.Activity
 import android.content.Context
+import android.content.SharedPreferences
+import com.navi.medici.androidCustomerApp.preferences.PreferenceWrapper.PREFS_FILENAME
 
 object PreferenceManager {
     fun getPersonId(context: Context): String? {
diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/repositories/RegisterRepository.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/repositories/RegisterRepository.kt
index e650f67390..0ac2be7863 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/repositories/RegisterRepository.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/repositories/RegisterRepository.kt
@@ -3,7 +3,7 @@ package com.navi.medici.androidCustomerApp.repositories
 import com.navi.medici.androidCustomerApp.api.RegisterApi
 import com.navi.medici.androidCustomerApp.models.request.RegisterRequest
 
-class RegisterRepository(private val launchApi: RegisterApi) {
+class RegisterRepository(private val registerApi: RegisterApi) {
     suspend fun checkDevice(registerRequest: RegisterRequest) =
-        suspend { launchApi.checkDevice(registerRequest) }.invoke()
+        suspend { registerApi.checkDevice(registerRequest) }.invoke()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/ui/activities/SplashScreenActivity.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/ui/activities/SplashScreenActivity.kt
index bfcff40c7d..5eccb2be97 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/ui/activities/SplashScreenActivity.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/ui/activities/SplashScreenActivity.kt
@@ -54,13 +54,12 @@ class SplashScreenActivity : AppCompatActivity() {
 
     @SuppressLint("MissingPermission")
     private fun getImei(): String {
-        return "12121212232323"
-//        val telephonyManager = getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
-//        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-//            telephonyManager.imei
-//        } else {
-//            telephonyManager.deviceId
-//        }
+        val telephonyManager = getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            telephonyManager.imei
+        } else {
+            telephonyManager.deviceId
+        }
     }
 
     override fun onRequestPermissionsResult(
diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/InputPanViewModel.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/InputPanViewModel.kt
index 87a67ee352..ee37306587 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/InputPanViewModel.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/InputPanViewModel.kt
@@ -21,11 +21,7 @@ class InputPanViewModel : ViewModel() {
         val inputPanRequest = InputPanRequest(pan)
         coroutineScope.launch {
             val response = inputPanRepository.submitPan(inputPanRequest)
-            if (response.isSuccessful) {
-                _panSubmitted.value = true
-            } else {
-                _panSubmitted.value = false
-            }
+            _panSubmitted.value = response.isSuccessful
         }
     }
 
diff --git a/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/SplashScreenViewModel.kt b/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/SplashScreenViewModel.kt
index 6a186c093a..40b3e38f25 100644
--- a/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/SplashScreenViewModel.kt
+++ b/app/src/main/java/com/navi/medici/androidCustomerApp/viewModels/SplashScreenViewModel.kt
@@ -28,7 +28,7 @@ class SplashScreenViewModel : ViewModel() {
         }
     }
 
-    companion object {
+    private companion object {
         private const val CHANNEL_ID: String = "android"
     }
 }
\ No newline at end of file