diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 3823b39..52a7188 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -12,7 +12,7 @@
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2024-01-22T11:26:05.362358Z" />
+    <timeTargetWasSelectedWithDropDown value="2024-01-29T07:18:34.414268Z" />
     <targetsSelectedWithDialog>
       <Target>
         <type value="QUICK_BOOT_TARGET" />
diff --git a/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java b/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java
index edf920c..ee4db90 100644
--- a/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java
+++ b/app/src/main/java/com/app/simplitend/cg_subscription/CgSubscriptionActivity.java
@@ -482,7 +482,7 @@ public class CgSubscriptionActivity extends AppCompatActivity
     private void inflatePlans() {
 
         binding.makePayment.setVisibility(View.VISIBLE);
-        binding.makePayment.setText(getString(R.string.subscribe));
+        binding.makePayment.setText(getString(R.string.subscribe_plus_tax));
 
         binding.yourPlan.setVisibility(View.GONE);
 
diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/AddContactFragment.java b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/AddContactFragment.java
index c414e0b..f481395 100644
--- a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/AddContactFragment.java
+++ b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/contacts/AddContactFragment.java
@@ -49,7 +49,7 @@ public class AddContactFragment extends Fragment implements WelcomeContracts.Con
     private ContactViewModel contactViewModel;
 
     private int contacts_count;
-    private boolean is_doctor_set;
+    private boolean is_doctor_set, is_contact_view_updated;
 
     private boolean isSetupComplete;
 
@@ -105,6 +105,7 @@ public class AddContactFragment extends Fragment implements WelcomeContracts.Con
     }
 
     private void initViews(boolean is_contact_view_updated) {
+        this.is_contact_view_updated = is_contact_view_updated;
 
         if (isSetupComplete) {
 
@@ -120,7 +121,7 @@ public class AddContactFragment extends Fragment implements WelcomeContracts.Con
 
                 popupMenu.setOnMenuItemClickListener(menuItem -> {
                     AppUtil.showAlert(requireContext(),
-                            "Are you sure?", "Do you want to change the contact list to 50 contacts?",
+                            "Are you sure?", "Do you want to change the family & friends contact list to 50 contacts?\nThis cannot be undone.",
                             "Yes", ((dialogInterface, i) -> {
                                 // yes
                                 if (AppUtil.isPatientLoggedIn(requireContext())){
@@ -257,7 +258,7 @@ public class AddContactFragment extends Fragment implements WelcomeContracts.Con
         if (contactData.id == -1){
             // a new contact should be added
 
-            if (contacts_count == 9 && !is_doctor_set){
+            if (contacts_count == 9 && !is_doctor_set && !is_contact_view_updated){
                 // last contact to be added
                 // and doctor not yet set
                 AppUtil.showAlert(requireContext(),
diff --git a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/LocationFragment.java b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/LocationFragment.java
index 6691d5d..030822c 100644
--- a/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/LocationFragment.java
+++ b/app/src/main/java/com/app/simplitend/welcome/welcomepatient/fragments/register/LocationFragment.java
@@ -423,7 +423,6 @@ public class LocationFragment extends Fragment implements OnMapReadyCallback,
                     if ((fineLocationGranted != null && fineLocationGranted) || (coarseLocationGranted != null && coarseLocationGranted)) {
                         if (currentLocation == null) {
                             // one of the location access granted.
-                            Toast.makeText(requireContext(), "Fetching your current location", Toast.LENGTH_SHORT).show();
                             if (googleMap != null) {
                                 if (ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(requireContext(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
                                     return;
diff --git a/app/src/main/res/layout/cg_subscription_layout.xml b/app/src/main/res/layout/cg_subscription_layout.xml
index 5245f4b..0c47b0c 100644
--- a/app/src/main/res/layout/cg_subscription_layout.xml
+++ b/app/src/main/res/layout/cg_subscription_layout.xml
@@ -464,7 +464,7 @@
                 android:fontFamily="@font/nunito_regular"
 
                 android:paddingVertical="12dp"
-                android:text="@string/subscribe"
+                android:text="@string/subscribe_plus_tax"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
                 android:textSize="@dimen/_12ssp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2294288..26f12ea 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -260,7 +260,8 @@
     <string name="enter_your_basic_details_like_name_number_email_address_pin"><![CDATA[Enter your basic details like Name, Number, Email, Address & Pin]]></string>
     <string name="accept_invitation">Accept invitation</string>
     <string name="accept_your_loved_one_s_invitation_to_connect">Accept your loved one\'s invitation to connect</string>
-    <string name="subscribe">Subscribe (+6.625% tax)</string>
+    <string name="subscribe">Subscribe</string>
+    <string name="subscribe_plus_tax">Subscribe (+6.625% tax)</string>
     <string name="complete_application_subscription">Complete application subscription</string>
     <string name="you_are_ready">You are ready!</string>
     <string name="your_phone_is_linked_to_your_loved_one">Your phone is linked to your loved one.</string>