diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index a766b4d..de9fef2 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -12,7 +12,7 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2023-12-05T11:34:20.505603Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-12-11T15:12:23.637532Z" />
     <targetsSelectedWithDialog>
       <Target>
         <type value="QUICK_BOOT_TARGET" />
diff --git a/app/build.gradle b/app/build.gradle
index d0d228e..2aa7823 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "com.app.simplitend"
         minSdk 24
         targetSdk 33
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/app/simplitend/apputils/RetrofitHelper.java b/app/src/main/java/com/app/simplitend/apputils/RetrofitHelper.java
index 2e96c5d..ac27d7e 100644
--- a/app/src/main/java/com/app/simplitend/apputils/RetrofitHelper.java
+++ b/app/src/main/java/com/app/simplitend/apputils/RetrofitHelper.java
@@ -16,7 +16,8 @@ public abstract class RetrofitHelper {
 //    private static final String BASE_URL = "https://simplitend.betadelivery.com/";
 
     // Staging BASE URL
-    private static final String BASE_URL = "https://simplitendapp.betadelivery.com/";
+//    private static final String BASE_URL = "https://simplitendapp.betadelivery.com/";
+    private static final String BASE_URL = "https://staging.simplitend.com/";
 
     public static final String IMAGE_BASE_URL = BASE_URL + "storage/upload/";
 
diff --git a/app/src/main/java/com/app/simplitend/chats/SocketHelper.java b/app/src/main/java/com/app/simplitend/chats/SocketHelper.java
index f2db747..0b10742 100644
--- a/app/src/main/java/com/app/simplitend/chats/SocketHelper.java
+++ b/app/src/main/java/com/app/simplitend/chats/SocketHelper.java
@@ -24,7 +24,7 @@ public class SocketHelper {
 
     private static final String TAG = "SOCKET_CHAT_TAG";
 
-    public static final String kHost = "http://simplitendapp.betadelivery.com:3002/";
+    public static final String kHost = "https://staging.simplitend.com:3002/";
 
     private static SocketHelper instance;
     private Socket mSocket;
diff --git a/app/src/main/java/com/app/simplitend/chats/mvvm/ChatViewModel.java b/app/src/main/java/com/app/simplitend/chats/mvvm/ChatViewModel.java
index 45289be..6284bab 100644
--- a/app/src/main/java/com/app/simplitend/chats/mvvm/ChatViewModel.java
+++ b/app/src/main/java/com/app/simplitend/chats/mvvm/ChatViewModel.java
@@ -21,7 +21,7 @@ public class ChatViewModel extends ViewModel {
 
     public ChatViewModel() {
         this.apiService = new Retrofit.Builder()
-                .baseUrl("https://simplitendapp.betadelivery.com/")
+                .baseUrl("https://staging.simplitend.com/")
                 .addConverterFactory(GsonConverterFactory.create())
                 .build().create(ChatsApiService.class);
     }
diff --git a/app/src/main/java/com/app/simplitend/locationupdates/LocationService.java b/app/src/main/java/com/app/simplitend/locationupdates/LocationService.java
index 551313e..782a200 100644
--- a/app/src/main/java/com/app/simplitend/locationupdates/LocationService.java
+++ b/app/src/main/java/com/app/simplitend/locationupdates/LocationService.java
@@ -48,6 +48,7 @@ public class LocationService extends Service implements LocationClient.DefaultLo
             switch (intent.getAction()){
                 case ACTION_START_LOCATION_UPDATES:
                     int minInterval = intent.getIntExtra(LOCATION_UPDATE_MIN_INTERVAL, 0);
+                    Log.d("location_update", "onStartCommand: " + minInterval);
                     if (minInterval != 0){
                         removeLocationUpdates();
                         startLocationUpdates(minInterval);
diff --git a/app/src/main/java/com/app/simplitend/patientgeofencing/GeoFenceBroadcastReceiver.java b/app/src/main/java/com/app/simplitend/patientgeofencing/GeoFenceBroadcastReceiver.java
index 5309dfc..4115a64 100644
--- a/app/src/main/java/com/app/simplitend/patientgeofencing/GeoFenceBroadcastReceiver.java
+++ b/app/src/main/java/com/app/simplitend/patientgeofencing/GeoFenceBroadcastReceiver.java
@@ -82,9 +82,9 @@ public class GeoFenceBroadcastReceiver extends BroadcastReceiver {
                 locationServiceIntent.setAction(LocationService.ACTION_START_LOCATION_UPDATES);
                 locationServiceIntent.putExtra(LOCATION_UPDATE_MIN_INTERVAL, LOCATION_INTERVAL_BASE_TIME);
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                    context.startForegroundService(intent);
+                    context.startForegroundService(locationServiceIntent);
                 } else {
-                    context.startService(intent);
+                    context.startService(locationServiceIntent);
                 }
                 break;
             case Geofence.GEOFENCE_TRANSITION_EXIT:
diff --git a/app/src/main/res/layout/geofence_bottom_sheet.xml b/app/src/main/res/layout/geofence_bottom_sheet.xml
index 960c742..6152b3c 100644
--- a/app/src/main/res/layout/geofence_bottom_sheet.xml
+++ b/app/src/main/res/layout/geofence_bottom_sheet.xml
@@ -118,7 +118,6 @@
         android:autofillHints="name"
         android:inputType="textCapSentences"
 
-        android:digits="@string/allowed_alphabets_with_space"
         android:singleLine="true"
 
         android:maxLength="255"